From 5dd3e1b7da74f347d4ad06a2d3851981c4252ba4 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 14 Jul 2026 16:00:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=97=B6=E5=90=8C=E6=AD=A5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=8A=B6=E6=80=81=E6=A0=87=E8=AF=86=20-=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=A1=AE=E4=BF=9D=E4=BF=A1=E6=81=AF=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E6=80=A7=20-=20=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E6=A0=87=E5=BF=97=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=96=B9=E6=B3=95=20-=20=E9=87=8D=E6=9E=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9B=B4=E6=96=B0=E5=91=BD=E4=BB=A4=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/info/facade/ZcloudUserFacadeImpl.java     |  6 ++----
 .../basic/info/command/HumanUserUpdateExe.java      | 13 +++++++++++++
 .../repository/impl/UserRepositoryImpl.java         |  3 +--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
index 15724769..d6a07eca 100644
--- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
+++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
@@ -175,10 +175,8 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade {
                 && !userUpdateCmd.getCorpinfoId().equals(userDO.getCorpinfoId())) {
             userUpdateCmd.setCorpinfoName(null);
         }
-        if (userDO != null
-                && userUpdateCmd.getDepartmentId() != null
-                && !userUpdateCmd.getDepartmentId().equals(userDO.getDepartmentId())) {
-            userUpdateCmd.setDepartmentName(null);
+        if (StringUtils.hasText(zcloudUserUpdateCmd.getDepartmentName())) {
+            userUpdateCmd.setDepartmentName(zcloudUserUpdateCmd.getDepartmentName());
         }
         if (userDO != null
                 && userUpdateCmd.getPostId() != null
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 4c26b878..e67d4f85 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
@@ -141,6 +141,7 @@ public class HumanUserUpdateExe {
         }
 
         fillMissingFields(userUpdateCmd, oldUserDO);
+         updateEmploymentFlagToInfoChange(oldUserDO);
         if (isResignation(userUpdateCmd)) {
             log.info("用户{}触发离职处理，准备检查离职前待交接任务", oldUserDO.getId());
             boolean resigned = executeHumanResignation(oldUserDO);
@@ -157,6 +158,7 @@ public class HumanUserUpdateExe {
         }
 
         log.info("用户{}在当前企业内发生部门、岗位等资料调整，直接走普通修改并同步底座", oldUserDO.getId());
+
         executeInsideCorpUpdate(oldUserDO, userUpdateCmd);
         return SingleResponse.of(oldUserDO.getId());
     }
@@ -280,6 +282,17 @@ public class HumanUserUpdateExe {
         userGateway.update(userE);
         log.info("用户{}仅同步rz_flag，旧值:{}, 新值:{}", oldUserDO.getId(), oldUserDO.getRzFlag(), userUpdateCmd.getRzFlag());
     }
+
+    private void updateEmploymentFlagToInfoChange(UserDO oldUserDO) {
+        if (Objects.equals(oldUserDO.getEmploymentFlag(), UserEmploymentFlagEnum.INFO_CHANGE.getCode())) {
+            return;
+        }
+        UserE userE = new UserE();
+        userE.setId(oldUserDO.getId());
+        userE.setEmploymentFlag(UserEmploymentFlagEnum.INFO_CHANGE.getCode());
+        userGateway.update(userE);
+    }
+
     /**
      * 完成离职收口。
      * 包括更新当前任职记录、更新用户变更记录，以及调用底座离职。
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index 92158485..0100cb65 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -807,7 +807,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
     public List<UserDO> listUserByInfo(Map<String, Object> parmas) {
         QueryWrapper<UserDO> queryWrapperList = new QueryWrapper<>();
         queryWrapperList.eq("phone", parmas.get("phone"));
-        queryWrapperList.eq("employment_flag",1);
+        queryWrapperList.in("employment_flag", Arrays.asList(1, 2));
         queryWrapperList.eq("user_id_card", parmas.get("userIdCard"));
         queryWrapperList.eq("delete_enum", "FALSE");
         queryWrapperList.orderByAsc("create_time");
@@ -819,4 +819,3 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         userMapper.updateEmploymentFlagAndDeleteEnum(userId, employmentFlag, deleteEnum);
     }
 }
-