From c83d18b8a1354f2fb2822300e44c7b6f1c7a17fc Mon Sep 17 00:00:00 2001
From: zhangxiongfeng <zhangxiongfeng@zcloudchina.com>
Date: Mon, 3 Aug 2026 10:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=8D=8E=E5=8F=A3=E9=97=A8=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8id=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/basic/info/command/UserAddExe.java  |  3 ++-
 .../basic/info/command/UserUpdateExe.java      | 18 +++++++++++-------
 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 cb377ce9..f63d5f1f 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
@@ -254,7 +254,8 @@ public class UserAddExe {
         personMap.put("paperType", 111);
         personMap.put("paperNumber", plainIdCard);
         personMap.put("phone", userE.getPhone());
-        personMap.put("departmentId", 1L);
+        Long realCorpId = userE.getCorpinfoId() != null ? userE.getCorpinfoId() : 1L;
+        personMap.put("departmentId", realCorpId);
         personMap.put("departmentType", 2);
         personMap.put("type", 3);
         if (userE.getNation() != null && !userE.getNation().trim().isEmpty()) {
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 1420bf92..5c8997ce 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
@@ -266,23 +266,26 @@ public class UserUpdateExe {
         String newNation = userUpdateCmd.getNation() != null ? userUpdateCmd.getNation() : userDO.getNation();
         String newNationName = userUpdateCmd.getNationName() != null ? userUpdateCmd.getNationName() : userDO.getNationName();
         Object newFaceFile = userUpdateCmd.getUserImg() != null ? userUpdateCmd.getUserImg() : userUpdateCmd.getFaceFile();
-        log.info("【本次请求入参】name是否传={}, phone是否传={}, userIdCard是否传={}, nation是否传={}, nationName是否传={}, userImg是否传={}, faceFile是否传={}",
+        Long newCorpId = userUpdateCmd.getCorpinfoId() != null ? userUpdateCmd.getCorpinfoId() : userDO.getCorpinfoId();
+        log.info("【本次请求入参】name是否传={}, phone是否传={}, userIdCard是否传={}, nation是否传={}, nationName是否传={}, userImg是否传={}, faceFile是否传={}, corpinfoId是否传={}",
                 userUpdateCmd.getName() != null, userUpdateCmd.getPhone() != null, userUpdateCmd.getUserIdCard() != null,
                 userUpdateCmd.getNation() != null, userUpdateCmd.getNationName() != null,
-                userUpdateCmd.getUserImg() != null, userUpdateCmd.getFaceFile() != null);
+                userUpdateCmd.getUserImg() != null, userUpdateCmd.getFaceFile() != null,
+                userUpdateCmd.getCorpinfoId() != null);
 
         boolean nameChanged = !Objects.equals(newName, userDO.getName());
         boolean idCardChanged = !Objects.equals(newIdCard, userDO.getUserIdCard());
         boolean phoneChanged = !Objects.equals(newPhone, userDO.getPhone());
         boolean nationChanged = !Objects.equals(newNation, userDO.getNation()) || !Objects.equals(newNationName, userDO.getNationName());
         boolean faceChanged = newFaceFile != null;
-        log.info("【变化检测】nameChanged={}({}→{}), idCardChanged={}, phoneChanged={}, nationChanged={}({}/{}→{}/{}), faceChanged={}",
+        boolean corpChanged = !Objects.equals(newCorpId, userDO.getCorpinfoId());
+        log.info("【变化检测】nameChanged={}({}→{}), idCardChanged={}, phoneChanged={}, nationChanged={}({}/{}→{}/{}), faceChanged={}, corpChanged={}({}→{})",
                 nameChanged, userDO.getName(), newName,
                 idCardChanged, phoneChanged,
                 nationChanged, userDO.getNation(), userDO.getNationName(), newNation, newNationName,
-                faceChanged);
-        if (!nameChanged && !idCardChanged && !phoneChanged && !nationChanged && !faceChanged) {
-            log.info("【跳过同步大华】姓名/身份证/手机号/民族/人脸图 5项都没变化，按优化逻辑不调更新接口");
+                faceChanged, corpChanged, userDO.getCorpinfoId(), newCorpId);
+        if (!nameChanged && !idCardChanged && !phoneChanged && !nationChanged && !faceChanged && !corpChanged) {
+            log.info("【跳过同步大华】姓名/身份证/手机号/民族/人脸图/企业 6项都没变化，按优化逻辑不调更新接口");
             return;
         }
 
@@ -308,7 +311,8 @@ public class UserUpdateExe {
         personMap.put("paperType", 111);
         personMap.put("paperNumber", plainIdCard);
         personMap.put("phone", newPhone);
-        personMap.put("departmentId", 1);
+        Long realCorpId = newCorpId != null ? newCorpId : 1L;
+        personMap.put("departmentId", realCorpId);
         personMap.put("nationName", newNationName != null && !newNationName.trim().isEmpty() ? newNationName : "汉族");
         try {
             if (newNation != null && !newNation.trim().isEmpty()) {