From 4e66d236d97744ed1fe9be4453193e3bd65f4935 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 9 Jul 2026 16:16:54 +0800
Subject: [PATCH] =?UTF-8?q?chore(build):=20=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/basic/info/command/HumanUserUpdateExe.java  | 10 ++++++----
 .../com/zcloud/basic/info/command/UserUpdateExe.java   |  2 +-
 .../basic/info/domain/model/UserChangeRecordE.java     |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java
index 092fb8e4..18419d08 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java
@@ -239,9 +239,11 @@ public class HumanUserUpdateExe {
      * @param userUpdateCmd 修改命令
      */
     private void executeInsideCorpUpdate(UserDO oldUserDO, UserUpdateCmd userUpdateCmd) {
-        userUpdateCmd.setEmploymentFlag(oldUserDO.getEmploymentFlag());
-        userUpdateCmd.setRzFlag(CommonFlagEnum.YES.getCode());
-        userUpdateExe.execute(userUpdateCmd);
+//        userUpdateCmd.setEmploymentFlag(oldUserDO.getEmploymentFlag());
+        UserUpdateCmd userUpdateCmdNew = new UserUpdateCmd();
+        BeanUtils.copyProperties(oldUserDO, userUpdateCmdNew);
+        userUpdateCmdNew.setRzFlag(CommonFlagEnum.YES.getCode());
+        userUpdateExe.execute(userUpdateCmdNew);
 
         UserDO newUserDO = userRepository.getInfoById(oldUserDO.getId());
         if (newUserDO == null) {
@@ -377,7 +379,7 @@ public class HumanUserUpdateExe {
         UserE oldUserE = buildUserE(oldUserDO);
         UserE newUserE = buildUserE(newUserDO);
         UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
-        userChangeRecordE.initUserUpdate(newUserE, oldUserE, resolveCorpinfoName(newUserDO), resolveDepartmentName(newUserDO));
+        userChangeRecordE.initUserUpdate(newUserE, oldUserE, resolveCorpinfoName(newUserDO), resolveDepartmentName(newUserDO),UserChangeRecordStatusEnum.PENDING.getCode());
         userChangeRecordGateway.add(userChangeRecordE);
     }
 
diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
index 9ae9ce91..2287c9d4 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
@@ -228,7 +228,7 @@ public class UserUpdateExe {
         BeanUtils.copyProperties(newUserDO, newUserE);
 
         UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
-        userChangeRecordE.initUserUpdate(newUserE, oldUserE, newUserDO.getCorpinfoName(), newUserDO.getDepartmentName());
+        userChangeRecordE.initUserUpdate(newUserE, oldUserE, newUserDO.getCorpinfoName(), newUserDO.getDepartmentName(),UserChangeRecordStatusEnum.APPROVED.getCode());
         userChangeRecordGateway.add(userChangeRecordE);
     }
 
diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java
index 894b4abf..e2a55eb6 100644
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java
@@ -119,7 +119,7 @@ public class UserChangeRecordE extends BaseE {
         this.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode());
     }
 
-    public void initUserUpdate(UserE userE, UserE oldUserE, String corpName, String name) {
+    public void initUserUpdate(UserE userE, UserE oldUserE, String corpName, String name,int status) {
         this.setUserId(userE.getId());
         this.setChangeTime(new Date());
         this.setCorpinfoIdBefore(oldUserE.getCorpinfoId());
@@ -138,7 +138,7 @@ public class UserChangeRecordE extends BaseE {
         this.setPostNameAfter(userE.getPostName());
         this.setUserNameAfter(userE.getName());
         this.setUserStatusAfter(oldUserE.getEmploymentFlag());
-        this.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode());
+        this.setStatus(status);
     }
     /**
      * 离职相关