zcloud_gbs
/
zcloud_gbs_basic_info_gwj
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增用户调整

dev_xiangguanfang
zhaokai 2025-12-31 15:58:22 +08:00
parent 5e378fb101
commit 5f45e6f2ba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -90,7 +90,6 @@ public class UserAddExe {
UserE userE = new UserE(); UserE userE = new UserE();
BeanUtils.copyProperties(cmd, userE); BeanUtils.copyProperties(cmd, userE);
userE.initAdd(tenantId, userE); userE.initAdd(tenantId, userE);
userRepository.checkUserIdCard(userE.getPhone(), userE.getUserIdCard());
//校验身份证是否存在 //校验身份证是否存在
List<UserDO> userDOList = userRepository.getByIdCard(userE.getUserIdCard(),null); List<UserDO> userDOList = userRepository.getByIdCard(userE.getUserIdCard(),null);
if(CollUtil.isNotEmpty(userDOList)){ if(CollUtil.isNotEmpty(userDOList)){
@ -98,8 +97,8 @@ public class UserAddExe {
userE.checkIdCardExist(userEList); userE.checkIdCardExist(userEList);
} }
//校验手机号 //校验手机号
// List<Integer> employmentFlagList = Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode()); List<Integer> employmentFlagList = Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
List<UserDO> userList = userRepository.getListByPhone( userE.getPhone(),null); List<UserDO> userList = userRepository.getListByPhone( userE.getPhone(),employmentFlagList);
if (CollUtil.isNotEmpty(userList)) { if (CollUtil.isNotEmpty(userList)) {
List<UserE> userEList = userCoConvertor.convertDOsToEs(userList); List<UserE> userEList = userCoConvertor.convertDOsToEs(userList);
userE.checkPhone(userEList); userE.checkPhone(userEList);
@ -421,7 +420,7 @@ public class UserAddExe {
} }
//校验手机号 //校验手机号
List<UserDO> userList = userRepository.getListByPhone(userE.getPhone(),null); List<UserDO> userList = userRepository.getListByPhone(userE.getPhone(),employmentFlagList);
Boolean addFlag = true; Boolean addFlag = true;
UserDO userDOUpdate = null; UserDO userDOUpdate = null;
if(CollUtil.isNotEmpty(userList)){ if(CollUtil.isNotEmpty(userList)){

3
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
View File

@ -365,7 +365,8 @@ public class UserE extends BaseE {
}else{ }else{
//判断在其他企业是否是固定人员 //判断在其他企业是否是固定人员
List<UserE> userList = userEList.stream().filter(userE -> UserFlowFlagEnum.FIXED.getCode().equals(userE.getFlowFlag())).collect(Collectors.toList()); List<UserE> userList = userEList.stream().filter(userE -> UserFlowFlagEnum.FIXED.getCode().equals(userE.getFlowFlag()))
.filter(userE -> !userE.getCorpinfoId().equals(AuthContext.getTenantId())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(userList)) { if (CollUtil.isNotEmpty(userList)) {
throw new BizException("当前手机号已在其他企业属于固定人员"); throw new BizException("当前手机号已在其他企业属于固定人员");
} }