From 560edb340cba785509cdeaddfa4cdf24eadbc17c Mon Sep 17 00:00:00 2001
From: SondonYong <songdongyong@zcloudchina.com>
Date: Tue, 30 Dec 2025 08:58:06 +0800
Subject: [PATCH] =?UTF-8?q?dev:=20=E6=89=AB=E7=A0=81=E5=85=A5=E8=81=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/command/UserAddExe.java     | 10 ++--------
 .../com/zcloud/basic/info/domain/model/UserE.java     | 11 +++++++++++
 2 files changed, 13 insertions(+), 8 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 c5eb8162..8be299ba 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
@@ -210,10 +210,8 @@ public class UserAddExe {
                         throw new BizException("该用户在当前企业存在未离职信息，无法重新入职");
                     }
                     // user表状态变为入职待审核
-                    u.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
                     BeanUtils.copyProperties(u, userE);
-                    userE.setDepartmentId(cmd.getDepartmentId());
-                    userE.setPostName(cmd.getPostName());
+                    userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(), null);
                     userGateway.update(userE);
                     corpFlag = true;
                     break;
@@ -230,11 +228,7 @@ public class UserAddExe {
                     UserDO user = firstUserWithIdCard.get();
                     BeanUtils.copyProperties(user, userE);
                     userE.setId(null);
-                    userE.setUserId(UuidUtil.get32UUID());
-                    userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
-                    userE.setCorpinfoId(cmd.getCorpinfoId());
-                    userE.setDepartmentId(cmd.getDepartmentId());
-                    userE.setPostName(cmd.getPostName());
+                    userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(), UuidUtil.get32UUID());
                     userRepository.saveOnboardingUser(userE);
                 } else {
                     // 没有找到符合条件的用户
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 44606064..6f8c56c0 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
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.jjb.saas.framework.domain.model.BaseE;
 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.gateway.DepartmentGateway;
 import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
@@ -175,6 +176,16 @@ public class UserE extends BaseE {
         userE.setPassword(defaultPassword);
     }
 
+    public void initFormOnboarding(Long corpinfoId, Long departmentId, String postName, String userId){
+        this.setCorpinfoId(corpinfoId);
+        this.setDepartmentId(departmentId);
+        this.setName(postName);
+        this.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
+        if(StringUtils.isNotEmpty(userId)){
+            this.setUserId(userId);
+        }
+    }
+
     public void initFromRZ(Long corpinfoId, Long roleId, RzUserRecordE rzUserRecordE){
         this.setCorpinfoId(corpinfoId);
         this.setDepartmentId(corpinfoId);