优化处理

flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml

@@ -60,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="siteType != null "> and site_type = #{siteType}</if>
             <if test="siteName != null  and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
-            <if test="siteStartTime != null "> and site_start_time &lt; #{siteStartTime}</if>
-            <if test="siteEndTime != null "> and site_end_time &gt; #{siteEndTime}</if>
+            <if test="siteStartTime != null "> and site_start_time &gt; #{siteStartTime}</if>
+            <if test="siteEndTime != null "> and site_end_time &lt; #{siteEndTime}</if>
             <if test="userRegisterStartTime != null "> and user_register_start_time = #{userRegisterStartTime}</if>
             <if test="userRegisterEndTime != null "> and user_register_end_time = #{userRegisterEndTime}</if>
             <if test="openType != null "> and open_type = #{openType}</if>

flossom-ui/src/views/system/scriptTag/index.vue

@@ -133,13 +133,13 @@
 <!--              </el-select>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-          <el-col :span="24">
+          <el-col :span="24" v-if="!topAdd">
             <el-form-item label="小程序标签" prop="tagIdArray" label-width="90px">
               <treeselect v-model="form.tagIdArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="企微标签" prop="companyIdArray">
+          <el-col :span="24" v-if="!topAdd">
+            <el-form-item label="企微标签" prop="companyIdArray" >
               <treeselect v-model="form.companyIdArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
             </el-form-item>
           </el-col>