Merge remote-tracking branch 'origin/master'

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -637,29 +637,36 @@ public class SysUserServiceImpl implements ISysUserService
                 user.setDeptId(deptId.getDeptId());
 
                 // 验证是否存在这个用户
-                SysUser u = userMapper.selectUserByUserName(user.getUserName());
-                if (StringUtils.isNull(u)) {
-                    BeanValidators.validateWithException(validator, user);
-                    deptService.checkDeptDataScope(user.getDeptId());
-                    user.setCreateBy(operName);
+                if (!this.checkUserNameUnique(user)) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
+                    continue;
+                } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !this.checkPhoneUnique(user)) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、手机号 " + user.getPhonenumber() + " 已存在");
+                    continue;
+                } else if (StringUtils.isNotEmpty(user.getEmail()) && !this.checkEmailUnique(user)) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、邮箱 " + user.getEmail() + " 已存在");
+                    continue;
+                }
 
-                    // 处理角色关联
-                    if (StringUtils.isNotEmpty(importDTO.getRoleName())) {
-                        SysRole roleId = roleMapper.checkRoleNameUnique(importDTO.getRoleName());
-                        if (StringUtils.isNotNull(roleId)) {
-                            user.setRoleIds(new Long[]{roleId.getRoleId()});
-                        }
-                    }
+                BeanValidators.validateWithException(validator, user);
+                deptService.checkDeptDataScope(user.getDeptId());
+                user.setCreateBy(operName);
 
-                    this.insertUser(user);
+                // 处理角色关联
+                if (StringUtils.isNotEmpty(importDTO.getRoleName())) {
+                    SysRole roleId = roleMapper.checkRoleNameUnique(importDTO.getRoleName());
+                    if (StringUtils.isNotNull(roleId)) {
+                        user.setRoleIds(new Long[]{roleId.getRoleId()});
+                    }
+                }
 
+                this.insertUser(user);
 
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                } else {
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
-                }
+                successNum++;
+                successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
             } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、账号 " + importDTO.getPhonenumber() + " 导入失败：";

jd-logistics-ui-v3/src/views/system/dept/index.vue

@@ -46,7 +46,7 @@
         >展开/折叠
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
             type="success"
             plain
@@ -55,7 +55,7 @@
             v-hasPermi="['system:dept:add']">
           模板下载
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
             type="success"
@@ -133,6 +133,11 @@
               <el-input v-model="form.deptName" placeholder="请输入供应商名称"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="供应商编码" prop="deptCode">
+              <el-input v-model="form.deptCode" placeholder="请输入供应商编码"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20"/>
@@ -281,6 +286,7 @@ const data = reactive({
   rules: {
     parentId: [{ required: true, message: "上级组织不能为空", trigger: "blur" }],
     deptName: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
+    deptCode: [{ required: true, message: "供应商编码不能为空", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
     phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
     rateValue: [
@@ -359,6 +365,7 @@ function reset() {
     deptId: undefined,
     parentId: undefined,
     deptName: undefined,
+    deptCode: undefined,
     orderNum: 0,
     leader: undefined,
     phone: undefined,