修改公司判重

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("身份证号已经存在，请联系管理员");

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>
+</mapper>