feat(tcm): 修改用户信息保存和更新时逻辑

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.UserPermissionDto;
+import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
 import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.tcm.api.dto.*;
@@ -1080,12 +1081,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             throw new BadRequest("本单位下用户证件号码重复，请核对！");
         }
 
-        if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
-                .eq(TzsUserInfo::getCertificateType, tzsUserInfo.getCertificateType())
-                .eq(TzsUserInfo::getCertificateNum, tzsUserInfo.getCertificateNum())
-                .ne(TzsUserInfo::getUnitCode, companyModel.getCompanyCode())
-                .eq(TzsUserInfo::getIsDelete, false)) > 0) {
-            throw new BadRequest("该用户已被其他单位绑定，请联系原单位转出！");
+        // 当人员类型仅为主要负责人时，不校验是否被其他单位绑定
+        if (!JSON.toJSONString(Collections.singletonList(UserPostEnum.ZYFZR.getCode())).equals(tzsUserInfo.getNewPost())) {
+            if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
+                    .eq(TzsUserInfo::getCertificateType, tzsUserInfo.getCertificateType())
+                    .eq(TzsUserInfo::getCertificateNum, tzsUserInfo.getCertificateNum())
+                    .ne(TzsUserInfo::getUnitCode, companyModel.getCompanyCode())
+                    .eq(TzsUserInfo::getIsDelete, false)) > 0) {
+                throw new BadRequest("该用户已被其他单位绑定，请联系原单位转出！");
+            }
         }
 
         if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
@@ -1205,13 +1209,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                 .eq(TzsUserInfo::getIsDelete, false)) > 0) {
             throw new BadRequest("本单位下用户证件号码重复，请核对！");
         }
-
-        if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
-                .eq(TzsUserInfo::getCertificateType, tzsUserInfoDto.getCertificateType())
-                .eq(TzsUserInfo::getCertificateNum, tzsUserInfoDto.getCertificateNum())
-                .ne(TzsUserInfo::getUnitCode, companyModel.getCompanyCode())
-                .eq(TzsUserInfo::getIsDelete, false)) > 0) {
-            throw new BadRequest("该用户已被其他单位绑定，请联系原单位转出！");
+        // 当人员类型仅为主要负责人时，不校验是否被其他单位绑定
+        if (!JSON.toJSONString(Collections.singletonList(UserPostEnum.ZYFZR.getCode())).equals(tzsUserInfoDto.getNewPost())) {
+            if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
+                    .eq(TzsUserInfo::getCertificateType, tzsUserInfoDto.getCertificateType())
+                    .eq(TzsUserInfo::getCertificateNum, tzsUserInfoDto.getCertificateNum())
+                    .ne(TzsUserInfo::getUnitCode, companyModel.getCompanyCode())
+                    .eq(TzsUserInfo::getIsDelete, false)) > 0) {
+                throw new BadRequest("该用户已被其他单位绑定，请联系原单位转出！");
+            }
         }
 
         if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()