From 8d7d9593473522a22ea5944fc1295e408ca3bbfb Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 6 Mar 2026 17:12:42 +0800 Subject: [PATCH] =?UTF-8?q?```=20feat(user):=20=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/basic/info/domain/model/UserE.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index 9ec45a21..cf4c9192 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -10,6 +10,7 @@ import com.jjb.saas.framework.utils.DataEncryptDecryptUtil; import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum; +import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity; import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity; @@ -371,6 +372,15 @@ public class UserE extends BaseE { if (CollUtil.isNotEmpty(userList)) { throw new BizException("当前手机号已在其他企业属于固定人员"); } + userEList.forEach(userE -> { + //如果是企业不是相关方企业，则不行 + if(!userE.getUserType().equals(UserTypeEnum.XGF.getCode()) && (UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag()) + || UserEmploymentFlagEnum.ENTRY_AUDIT.getCode().equals(userE.getEmploymentFlag()) + || UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode().equals(userE.getEmploymentFlag()))){ + throw new BizException("当前手机号已存在"); + } + }); + //判断是否在当前企业存在 //判断是否有当前企业 boolean flag = userEList.stream().filter(userE -> UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag())