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 a9b93a6e..31e01e4c 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 @@ -475,17 +475,16 @@ public class UserAddExe { UserDO userDOUpdate = null; if (CollUtil.isNotEmpty(userList)) { // UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userE.getPhone()); - //获取在职企业信息 - userList.forEach(u -> { - if (UserEmploymentFlagEnum.ON.getCode().equals(u.getEmploymentFlag()) - || UserEmploymentFlagEnum.ENTRY_AUDIT.getCode().equals(u.getEmploymentFlag()) - || UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode().equals(u.getEmploymentFlag())) { - throw new BizException("该固定用户存在未离职信息,无法添加"); - } - }); if (UserFlowFlagEnum.FIXED.getCode().equals(cmd.getFlowFlag())) { - + //获取在职企业信息 + userList.forEach(u -> { + if (UserEmploymentFlagEnum.ON.getCode().equals(u.getEmploymentFlag()) + || UserEmploymentFlagEnum.ENTRY_AUDIT.getCode().equals(u.getEmploymentFlag()) + || UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode().equals(u.getEmploymentFlag())) { + throw new BizException("该固定用户存在未离职信息,无法添加"); + } + }); Optional optionalUserDO = userList.stream().filter(u -> AuthContext.getTenantId().equals(u.getCorpinfoId()) || u.getCorpinfoId() == null).findFirst(); if (optionalUserDO.isPresent()) { addFlag = false;