导入员工的时候添加逻辑判断

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package org.rcisoft.sys.sysuser.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.core.component.CyDownErrorTxtComp;
 import org.rcisoft.core.exception.CyServiceException;
 import org.rcisoft.core.result.enums.CyResSvcExcEnum;
@@ -100,11 +101,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
             for (SysUser u : userList) {
                 if (u.getUserType().equals("0"))
                     throw new CyServiceException(500, u.getPhone() + "已被其他员工绑定。");
-                // 若是访客需要将访客账户删除
-                if (!u.getName().equals(sysUser.getName())) {
-                    u.setName(sysUser.getName());
-                    sysUserRepositorys.updateSysUser(u);
-                }
             }
             return new CyPersistModel(1);
         } else {
@@ -522,6 +518,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
             for (ExportUserDTO sysUser : sysUserList) {
                 errorDTO = new UserErrorDTO();
                 sysUser.setIdentity("0");
+                // 判断是否存在用户
+                List<SysUser> userList = sysUserRepositorys.querySysUsersByPhone(sysUser.getPhone());
+                // 用户已存在
+                if (userList.size() > 0) {
+                    // 判断存在的用户是否员工，员工报错
+                    for (SysUser u : userList) {
+                        if (u.getUserType().equals("0")) {
+                            BeanUtil.copyProperties(sysUser, errorDTO);
+                            errorDTO.setError("手机号已被其他员工绑定。");
+                            errorDTOArrayList.add(errorDTO);
+                        } else {
+                            BeanUtil.copyProperties(sysUser, errorDTO);
+                            errorDTO.setError("手机号已被其他访客绑定。");
+                            errorDTOArrayList.add(errorDTO);
+                        }
+                    }
+                }
+                if(StringUtils.isNotEmpty(errorDTO.getError()))
+                    continue;
                 //性别
                 if (sysUser.getSex().equals("男")) {
                     sysUser.setSex("1");