feat: 用户、组织机构导入功能开发；

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() + " 导入失败：";