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 i Map 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 @@ and phone = #{params.phone} + + and tenant_id = #{params.tenantId} + @@ -608,7 +611,7 @@ delete_enum = #{deleteEnum} WHERE id = #{userId} - + - \ No newline at end of file +