From 5f45e6f2bac36aab51de7f6f4ff705fafcc4db9d Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Wed, 31 Dec 2025 15:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/basic/info/command/UserAddExe.java     | 7 +++----
 .../java/com/zcloud/basic/info/domain/model/UserE.java     | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
index 1b03902b..1abb028c 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
@@ -90,7 +90,6 @@ public class UserAddExe {
         UserE userE = new UserE();
         BeanUtils.copyProperties(cmd, userE);
         userE.initAdd(tenantId, userE);
-        userRepository.checkUserIdCard(userE.getPhone(), userE.getUserIdCard());
         //校验身份证是否存在
         List<UserDO> userDOList = userRepository.getByIdCard(userE.getUserIdCard(),null);
         if(CollUtil.isNotEmpty(userDOList)){
@@ -98,8 +97,8 @@ public class UserAddExe {
             userE.checkIdCardExist(userEList);
         }
         //校验手机号
-//        List<Integer> employmentFlagList = Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
-        List<UserDO> userList = userRepository.getListByPhone( userE.getPhone(),null);
+        List<Integer> employmentFlagList = Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
+        List<UserDO> userList = userRepository.getListByPhone( userE.getPhone(),employmentFlagList);
         if (CollUtil.isNotEmpty(userList)) {
             List<UserE> userEList  = userCoConvertor.convertDOsToEs(userList);
             userE.checkPhone(userEList);
@@ -421,7 +420,7 @@ public class UserAddExe {
         }
 
         //校验手机号
-        List<UserDO> userList = userRepository.getListByPhone(userE.getPhone(),null);
+        List<UserDO> userList = userRepository.getListByPhone(userE.getPhone(),employmentFlagList);
         Boolean addFlag = true;
         UserDO userDOUpdate = null;
         if(CollUtil.isNotEmpty(userList)){
diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
index 2d85a91d..702b6dad 100644
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
@@ -365,7 +365,8 @@ public class UserE extends BaseE {
 
         }else{
             //判断在其他企业是否是固定人员
-            List<UserE> userList = userEList.stream().filter(userE -> UserFlowFlagEnum.FIXED.getCode().equals(userE.getFlowFlag())).collect(Collectors.toList());
+            List<UserE> userList = userEList.stream().filter(userE -> UserFlowFlagEnum.FIXED.getCode().equals(userE.getFlowFlag()))
+                    .filter(userE -> !userE.getCorpinfoId().equals(AuthContext.getTenantId())).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(userList)) {
                 throw new BizException("当前手机号已在其他企业属于固定人员");
             }