bug

src/main/java/org/rcisoft/sys/sysuser/dao/SysUserRepositorys.java

@@ -21,6 +21,8 @@ public interface SysUserRepositorys extends CyBaseMapper<SysUser> {
 
     List<SysUser> querySysUsers(@Param("entity") SysUser sysUser);
 
+    List querySysUsersByPhones(String phone);
+
     //新增dto
     public int addSysUser(ExportUserDTO exportUserDTO);
 
@@ -35,6 +37,7 @@ public interface SysUserRepositorys extends CyBaseMapper<SysUser> {
 
     //单个查询
     SysUser querySysUsersById(Integer business_id);
+
     //单个查询
     SysUser querySysUsersByUname(@Param("username") String username);
 
@@ -44,7 +47,7 @@ public interface SysUserRepositorys extends CyBaseMapper<SysUser> {
 
     List<SysUser> querySysUsersByPhone(String phone);
 
-    List<SysUser> querySysUsersByPhoneOUt(@Param("phone") String phone,@Param("userId")Integer userId);
+    List<SysUser> querySysUsersByPhoneOUt(@Param("phone") String phone, @Param("userId") Integer userId);
 
     List<SysUser> querySysUsersByUserName(String username);
 
@@ -73,6 +76,7 @@ public interface SysUserRepositorys extends CyBaseMapper<SysUser> {
 
     //微信根据手机号查询用户
     List<UserDto> selectByPhoneWx(String phone);
+
     //微信根据openid查询用户
     List<UserDto> selectByOpenidWx(String wxOpenid);
 }

src/main/java/org/rcisoft/sys/sysuser/util/CheckUtil.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.core.constant.CySysCons;
 import org.rcisoft.core.exception.CyServiceException;
+import org.rcisoft.sys.sysuser.dao.SysUserRepositorys;
 import org.rcisoft.sys.sysuser.dto.ExportUserDTO;
 import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.rcisoft.sys.visit.dto.ExportVisitInfoDto;
@@ -12,6 +13,7 @@ import org.rcisoft.sys.visit.dto.ExportVisitUserDTO;
 import org.rcisoft.sys.visit.dto.VisitInformationErrorDTO;
 import org.rcisoft.sys.visit.dto.VisitPersonDTO;
 import org.rcisoft.sys.wbac.user.dto.ErrorDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.util.CollectionUtils;
 
@@ -31,6 +33,7 @@ import java.util.stream.Collectors;
 public class CheckUtil {
 
 
+
     /**
      * 对导入的用户信息进行非空校验
      *
@@ -111,7 +114,7 @@ public class CheckUtil {
         if (StringUtils.isEmpty(visitInfoDto.getVisitPhone()))
             notTrue.add("访客手机号不能为空");
         // 判断访客姓名和手机号是否数量匹配
-        if (StringUtils.isNotEmpty(visitInfoDto.getVisitName()) && StringUtils.isEmpty(visitInfoDto.getVisitPhone())) {
+        if (StringUtils.isNotEmpty(visitInfoDto.getVisitName()) && StringUtils.isNotEmpty(visitInfoDto.getVisitPhone())) {
             List<String> userName = Arrays.asList(visitInfoDto.getVisitName().split(",|，")).stream()
                     .filter(u -> StringUtils.isNotEmpty(u)).collect(Collectors.toList());
             List<String> phone = Arrays.asList(visitInfoDto.getVisitPhone().split(",|，")).stream()
@@ -143,6 +146,7 @@ public class CheckUtil {
     }
 
     public static VisitPersonDTO visvitNotNull(ExportVisitUserDTO sysUser) {
+
         VisitPersonDTO errorDTO = new VisitPersonDTO();
         Map<Integer, List<String>> notTrues = new HashMap<>();
         List<String> notTrue = new ArrayList<>();
@@ -154,6 +158,7 @@ public class CheckUtil {
             notTrue.add("手机号不能为空");
         }
         if (!StringUtils.isEmpty(sysUser.getPhone())) {
+
             List<String> phone = Arrays.asList(sysUser.getPhone().split(",|，")).stream()
                     .filter(p -> StringUtils.isNotEmpty(p)).distinct().collect(Collectors.toList());
             List<String> matchList = phone.stream().filter(p -> p.matches("^1[3-9]\\d{9}$")).collect(Collectors.toList());

src/main/java/org/rcisoft/sys/visit/service/impl/VisitUserServiceImpl.java

@@ -266,6 +266,10 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
             for (ExportVisitUserDTO sysUser : sysUserList) {
                 //判断 是否为空
                 VisitPersonDTO userNull = CheckUtil.visvitNotNull(sysUser);
+                List sysUsers = sysUserRepositorys.querySysUsersByPhones(sysUser.getPhone());
+                if (sysUsers.size() != 0) {
+                    userNull.setError("已有员工绑定此手机号");
+                }
                 if (userNull != null) {
                     visitPersonList.add(userNull);
                 } else

src/main/resources/mapper/SysUserRepositorys.xml

@@ -119,6 +119,17 @@
         </if>
     </select>
 
+    <select id="querySysUsersByPhones" resultMap="BaseResultMap">
+        select *
+        from sys_user
+        where del_flag = 0
+        and user_type = 0
+        and (identity = 2 or identity = 1)
+        <if test="phone !=null and phone != '' ">
+            and phone = #{entity.phone}
+        </if>
+    </select>
+
     <select id="querySysUsersPaged" resultMap="BaseResultMap">
         select distinct sdd.dict_sort,su.*
         from sys_user su