bug修复优化

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUser.java

@@ -25,13 +25,17 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+//    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
     /** 部门ID */
-    @Excel(name = "部门编号", type = Type.IMPORT)
+//    @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
+    /** 部门名称 */
+    @Excel(name = "部门名称", type = Type.IMPORT)
+    private String deptName;
+
     /** 用户账号 */
     @Excel(name = "登录名称")
     private String userName;
@@ -92,6 +96,14 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public SysUser()
     {
 

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 = #{siteStartTime}</if>
+            <if test="siteStartTime != null "> and site_start_time &lt; #{siteStartTime}</if>
-            <if test="siteEndTime != null "> and site_end_time = #{siteEndTime}</if>
+            <if test="siteEndTime != null "> and site_end_time &gt; #{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-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.flossom.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
 
@@ -53,6 +54,8 @@ public class SysUserServiceImpl implements ISysUserService
 
     @Autowired
     protected Validator validator;
+    @Autowired
+    private SysDeptMapper deptMapper;
 
     /**
      * 根据条件分页查询用户列表
@@ -495,9 +498,33 @@ public class SysUserServiceImpl implements ISysUserService
         String password = configService.selectConfigByKey("sys.user.initPassword");
         for (SysUser user : userList)
         {
+            if (Objects.isNull(user)) {
+                failureNum++;
+                continue;
+            }
             user.setUserId(null);
             try
             {
+                // 验证部门是否存在
+                String deptName = user.getDeptName();
+                if (StringUtils.isEmpty(deptName)) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、部门信息为空");
+                    continue;
+                } else {
+                    SysDept dept = new SysDept();
+                    dept.setDeptName(deptName.trim());
+                    List<SysDept> sysDepts = deptMapper.selectDeptList(dept);
+                    if (CollectionUtils.isEmpty(sysDepts)) {
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、部门不存在");
+                        continue;
+                    } else {
+                        Long deptId = sysDepts.get(0).getDeptId();
+                        user.setDeptId(deptId);
+                        user.setDept(sysDepts.get(0));
+                    }
+                }
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
                 if (StringUtils.isNull(u))
@@ -525,6 +552,7 @@ public class SysUserServiceImpl implements ISysUserService
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
                 }
+
             }
             catch (Exception e)
             {
@@ -536,12 +564,12 @@ public class SysUserServiceImpl implements ISysUserService
         }
         if (failureNum > 0)
         {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确");
             throw new ServiceException(failureMsg.toString());
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条：");
         }
         if (StringUtils.isNotEmpty(successMsg.toString()) && !"null".equals(successMsg.toString())) {
             return successMsg.toString();

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

@@ -31,7 +31,7 @@
             <div class="el-upload__tip" slot="tip">请上传视频，用于启动页显示，比例建议为16: 9</div>
           </el-upload>
           <div slot="footer" class="dialog-footer" style="margin-left: 70%;margin-top: 10%">
-            <el-button type="primary" @click="handleDelete()">删 除</el-button>
+            <el-button type="primary" @click="handleDelete(null,1)">删 除</el-button>
           </div>
         </div>
       </el-tab-pane>
@@ -76,7 +76,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer" style="margin-left: 10%;margin-top: 5%">
               <el-button type="primary" @click="submitForm(item)">提 交</el-button>
-              <el-button @click="handleDelete(item)">删 除</el-button>
+              <el-button @click="handleDelete(item,2)">删 除</el-button>
               <el-button type="primary" @click="handleAddInfo">新 增</el-button>
             </div>
           </div>
@@ -177,12 +177,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        title: [
+        // title: [
-          { required: true, message: '请输入标题', trigger: 'blur' },
+        //   { required: true, message: '请输入标题', trigger: 'blur' },
-        ],
+        // ],
-        content: [
+        // content: [
-          { required: true, message: '请输入内容', trigger: 'blur' },
+        //   { required: true, message: '请输入内容', trigger: 'blur' },
-        ]
+        // ]
       }
     };
   },
@@ -357,16 +357,22 @@ export default {
       }
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
+    handleDelete(row,flag) {
+      let content = "";
       if(!row && this.videoForm) {
         row = this.videoForm;
       }
+      if (flag == 1) {
+        content += '启动页视频';
+      } else {
+        content += '介绍页标题为'+row.title+'的数据项';
+      }
       if (!row.id) {
         this.$modal.msgError('目前数据状态不允许删除');
         return;
       }
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除登录页信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除"' + content + '"？').then(function() {
         return delInfo(ids);
       }).then(() => {
         this.getList();

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

@@ -126,7 +126,7 @@
           </el-col>
           <el-col :span="24"  v-if="!topAdd">
             <el-form-item label="标签类型" prop="tagType">
-              <el-select v-model="form.tagType">
+              <el-select v-model="form.tagType" >
                 <el-option label="小程序标签" :value="1" :key="1"></el-option>
                 <el-option label="企微标签" :value="2" :key="2"></el-option>
               </el-select>
@@ -307,6 +307,13 @@ export default {
         this.loading = false;
       });
     },
+    // tagChange(){
+    //   if (this.form.id) {
+    //     // this.form.tagIdArray = [];
+    //   } else {
+    //     // this.form.tagIdArray = [];
+    //   }
+    // },
     /** 转换标签数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {

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

@@ -201,7 +201,7 @@
           <div slot="placeholder" class="image-slot"><span class="dot"></span>
           </div>
         </el-image>
-        <el-form-item label="弹窗封面" prop="fileUrl">
+        <el-form-item label="轮播封面" prop="fileUrl">
           <el-upload
             ref="upload"
             :limit="1"
@@ -380,8 +380,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24"  v-if="form.type == 4" label-width="90px">
-            <el-form-item label="页面链接" prop="redirectUrl">
+            <el-form-item label="小程序页面" prop="redirectUrl">
-              <el-input v-model="form.redirectUrl"  placeholder="请输入页面链接" />
+              <el-input v-model="form.redirectUrl"  placeholder="请输入小程序页面" />
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="form.type == 5 || form.type == 6">
@@ -502,7 +502,7 @@ export default {
       // 表单校验
       rules: {
         fileUrl: [
-          { required: true, message: "弹窗封面不能为空", trigger: "blur" }
+          { required: true, message: "轮播封面不能为空", trigger: "blur" }
         ],
         pushType: [
           { required: true, message: "推送频次不能为空", trigger: "blur" }
@@ -653,7 +653,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加轮播图";
+      this.title = "添加轮播列表";
       this.form.orderNumber = 1000;
       this.form.userType = 2;
     },
@@ -695,7 +695,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (!this.form.fileUrl) {
-            this.$modal.msgError("弹窗封面不能为空");
+            this.$modal.msgError("轮播封面不能为空");
             return;
           }
           // 处理时间

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

@@ -211,7 +211,7 @@
           <el-upload
             ref="upload"
             :limit="1"
-            accept=".jpg, .png, .jpeg"
+            accept=".jpg, .png"
             :headers="upload.headers"
             :action="upload.url"
             :disabled="upload.isUploading"
@@ -221,7 +221,7 @@
           >
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">请上传启动页介绍图片，建议尺寸为330px*460p</div>
+            <div class="el-upload__tip" slot="tip">只能上传jpg/png图片，建议尺寸300px*400px</div>
           </el-upload>
         </el-form-item>
         <el-form-item label="标题" prop="siteName">
@@ -270,7 +270,7 @@
             </el-form-item>
           </el-col>
         <el-col :span = "12">
-            <el-form-item label="推送时间" prop="pushTimer"  v-if="form.pushType==3">
+            <el-form-item label="推送时间" prop="pushTimerArray"  v-if="form.pushType==3">
               <el-select v-model="form.pushTimerArray" multiple placeholder="请选择" size="small">
                 <el-option label="星期一" :value="1" :key="1"></el-option>
                 <el-option label="星期二" :value="2" :key="2"></el-option>
@@ -296,21 +296,21 @@
           <treeselect v-model="form.forbidCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
         </el-form-item>
         <el-row>
-          <el-col :span = "12">
+<!--          <el-col :span = "12">-->
-            <el-form-item label="所属渠道" prop="channelId">
+<!--            <el-form-item label="所属渠道" prop="channelId">-->
-              <el-select v-model="form.channelArray" multiple placeholder="请选择">
+<!--              <el-select v-model="form.channelArray" multiple placeholder="请选择">-->
-                <el-option
+<!--                <el-option-->
-                  v-for="item in channelList"
+<!--                  v-for="item in channelList"-->
-                  :key="item.id"
+<!--                  :key="item.id"-->
-                  :label="item.channelName"
+<!--                  :label="item.channelName"-->
-                  :value="item.id">
+<!--                  :value="item.id">-->
-                </el-option>
+<!--                </el-option>-->
-              </el-select>
+<!--              </el-select>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
-          <el-col :span = "12">
+          <el-col :span = "24">
         <el-form-item label="仪器" prop="channelId">
-          <el-select v-model="form.machineArray" multiple placeholder="请选择">
+          <el-select v-model="form.machineArray" multiple placeholder="请选择" style="width: 80%">
             <el-option
               v-for="instrument in instrumentList"
               :key="instrument.id"
@@ -532,7 +532,7 @@ export default {
           { required: true, message: "跳转参数不能为空", trigger: "blur" }
         ],
         redirectUrl: [
-          { required: true, message: "页面链接不能为空", trigger: "blur" }
+          { required: true, message: "小程序页面不能为空", trigger: "blur" }
         ],
         videoNo: [
           { required: true, message: "视频号ID不能为空", trigger: "blur" }
@@ -540,7 +540,7 @@ export default {
         feedId: [
           { required: true, message: "视频号feedId不能为空", trigger: "blur" }
         ],
-        pushTimer: [
+        pushTimerArray: [
           { required: true, message: "自定义频次时间不能为空", trigger: "blur" }
         ],
         pushNumber: [
@@ -656,8 +656,9 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加站点管理";
+      this.title = "添加弹窗列表";
       this.form.orderNumber = 1000;
+      this.form.userType = 2;
     },
     /** 修改按钮操作 */
     handleUpdate(row, operate) {