From a43fed3d81483c98a75e30093de073c11314be17 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Sat, 17 Jan 2026 15:14:33 +0800 Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=20=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E=E5=B7=B2=E7=A6=BB=E8=81=8C?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/command/UserAddExe.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) 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;