diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index 31187575..89143917 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -169,11 +169,15 @@ public class UserAddExe { // userRepository.checkUserIdCard(cmd.getId(),cmd.getUserIdCard()); if(userDO.getFlowFlag()!=null && !userDO.getFlowFlag().equals(cmd.getFlowFlag())){ - // 已完善,与旧数据对比 - List userCorpRecordDOList = userCorpRecordRepository.getInfoListByUserId(cmd.getId()); - if(CollUtil.isNotEmpty(userCorpRecordDOList)){ - throw new BizException("该用户尚有未离职企业,不能修改人员流动状态"); + if(cmd.getFlowFlag() == UserFlowFlagEnum.FIXED.getCode()){ + // 流动转固定 + List listByPhone = userRepository.getListByPhone(userDO.getPhone(), Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode())); + + if(CollUtil.isNotEmpty(listByPhone) && listByPhone.size() > 1){ + throw new BizException("该用户存在多家未离职信息,不能修改人员流动状态"); + } } + } userGateway.update(userE);