From 4363800e5b9b9faed2e6e87a82476e16108b11a8 Mon Sep 17 00:00:00 2001
From: SondonYong <songdongyong@zcloudchina.com>
Date: Tue, 30 Dec 2025 16:56:50 +0800
Subject: [PATCH] =?UTF-8?q?dev:=20=E6=B5=81=E5=8A=A8=E8=BD=AC=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/command/UserAddExe.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 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 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<UserCorpRecordDO> userCorpRecordDOList = userCorpRecordRepository.getInfoListByUserId(cmd.getId());
-            if(CollUtil.isNotEmpty(userCorpRecordDOList)){
-                throw new BizException("该用户尚有未离职企业，不能修改人员流动状态");
+            if(cmd.getFlowFlag() == UserFlowFlagEnum.FIXED.getCode()){
+                // 流动转固定
+                List<UserDO> 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);