From 5164ca154392471bd7d1f2accf3495dc1e326870 Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Fri, 21 Aug 2026 09:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8=E5=88=A4?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/repository/impl/UserRepositoryImpl.java    | 4 ++++
 .../src/main/resources/mapper/UserMapper.xml               | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index 77ee5d34..d9a9ab92 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -730,6 +730,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         Map<String, Object> verifyParam = new HashMap<>();
         verifyParam.put("userIdCard", userIdCard);
         verifyParam.put("id", id);
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        if(ssoUser != null ){
+            verifyParam.put("tenantId", ssoUser.getTenantId());
+        }
         Integer count = userMapper.countUser(verifyParam);
         if (count > 0) {
             throw new BizException("身份证号已经存在，请联系管理员");
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index ccc92eec..59b6095b 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -495,6 +495,9 @@
             <if test="params.phone != null">
                 and phone = #{params.phone}
             </if>
+            <if test="params.tenantId != null">
+                and tenant_id = #{params.tenantId}
+            </if>
         </where>
     </select>
 
@@ -608,7 +611,7 @@
             delete_enum = #{deleteEnum}
         WHERE id = #{userId}
     </update>
-    
+
     <select id="pageByNopermissionAll" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
         select
             d.name as department_name,
@@ -684,4 +687,4 @@
                  left join post p on p.id = u.post_id
             ${ew.customSqlSegment}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>