Commit f7efaa2a authored by tianbo's avatar tianbo

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

- 当人员类型仅为主要负责人时,不校验是否被其他单位绑定 - 在用户信息保存和更新时增加该逻辑判断
parent 9bbcb8de
...@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey; ...@@ -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.RedisUtils;
import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil; 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.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.event.CommonPublisher;
import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent; import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
import com.yeejoin.amos.boot.module.tcm.api.dto.*; import com.yeejoin.amos.boot.module.tcm.api.dto.*;
...@@ -1080,6 +1081,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -1080,6 +1081,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
throw new BadRequest("本单位下用户证件号码重复,请核对!"); throw new BadRequest("本单位下用户证件号码重复,请核对!");
} }
// 当人员类型仅为主要负责人时,不校验是否被其他单位绑定
if (!JSON.toJSONString(Collections.singletonList(UserPostEnum.ZYFZR.getCode())).equals(tzsUserInfo.getNewPost())) {
if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>() if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
.eq(TzsUserInfo::getCertificateType, tzsUserInfo.getCertificateType()) .eq(TzsUserInfo::getCertificateType, tzsUserInfo.getCertificateType())
.eq(TzsUserInfo::getCertificateNum, tzsUserInfo.getCertificateNum()) .eq(TzsUserInfo::getCertificateNum, tzsUserInfo.getCertificateNum())
...@@ -1087,6 +1090,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -1087,6 +1090,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
.eq(TzsUserInfo::getIsDelete, false)) > 0) { .eq(TzsUserInfo::getIsDelete, false)) > 0) {
throw new BadRequest("该用户已被其他单位绑定,请联系原单位转出!"); throw new BadRequest("该用户已被其他单位绑定,请联系原单位转出!");
} }
}
if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>() if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
.eq(TzsUserInfo::getUnitCode, companyModel.getCompanyCode()) .eq(TzsUserInfo::getUnitCode, companyModel.getCompanyCode())
...@@ -1205,7 +1209,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -1205,7 +1209,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
.eq(TzsUserInfo::getIsDelete, false)) > 0) { .eq(TzsUserInfo::getIsDelete, false)) > 0) {
throw new BadRequest("本单位下用户证件号码重复,请核对!"); throw new BadRequest("本单位下用户证件号码重复,请核对!");
} }
// 当人员类型仅为主要负责人时,不校验是否被其他单位绑定
if (!JSON.toJSONString(Collections.singletonList(UserPostEnum.ZYFZR.getCode())).equals(tzsUserInfoDto.getNewPost())) {
if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>() if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
.eq(TzsUserInfo::getCertificateType, tzsUserInfoDto.getCertificateType()) .eq(TzsUserInfo::getCertificateType, tzsUserInfoDto.getCertificateType())
.eq(TzsUserInfo::getCertificateNum, tzsUserInfoDto.getCertificateNum()) .eq(TzsUserInfo::getCertificateNum, tzsUserInfoDto.getCertificateNum())
...@@ -1213,6 +1218,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -1213,6 +1218,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
.eq(TzsUserInfo::getIsDelete, false)) > 0) { .eq(TzsUserInfo::getIsDelete, false)) > 0) {
throw new BadRequest("该用户已被其他单位绑定,请联系原单位转出!"); throw new BadRequest("该用户已被其他单位绑定,请联系原单位转出!");
} }
}
if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>() if (tzsUserInfoMapper.selectCount(new LambdaQueryWrapper<TzsUserInfo>()
.eq(TzsUserInfo::getUnitCode, companyModel.getCompanyCode()) .eq(TzsUserInfo::getUnitCode, companyModel.getCompanyCode())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment