From e269ab1399809c670bf5f19020f95340d03aae65 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 5 Jan 2026 13:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=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     |  4 ++--
 .../com/zcloud/basic/info/command/UserUpdateExe.java  | 11 ++++-------
 2 files changed, 6 insertions(+), 9 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 bc0660cc..e3415120 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
@@ -191,7 +191,7 @@ public class UserAddExe {
 //        userRepository.checkUserIdCard(cmd.getId(),cmd.getUserIdCard());
 
         if (userDO.getFlowFlag() != null && !userDO.getFlowFlag().equals(cmd.getFlowFlag())) {
-            if (cmd.getFlowFlag() == UserFlowFlagEnum.FIXED.getCode()) {
+            if (UserFlowFlagEnum.FIXED.getCode().equals(cmd.getFlowFlag())) {
                 // 流动转固定
                 List<UserDO> listByPhone = userRepository.getListByPhone(userDO.getPhone(), Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode()));
 
@@ -206,7 +206,7 @@ public class UserAddExe {
 
         // 底座同步修改姓名和邮箱
         if (StringUtils.isNotEmpty(userDO.getName())) {
-            if (!userDO.getName().equals(cmd.getName()) || !userDO.getEmail().equals(cmd.getEmail())) {
+           if (!Objects.equals(userDO.getName(), cmd.getName()) || !Objects.equals(userDO.getEmail(), cmd.getEmail())) {
                 // 判断底座是否有该用户信息，如果没有则不调用底座
                 SingleResponse<UserDetailCO> detail = null;
                 try {
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 d992c7ce..177accc8 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
@@ -38,10 +38,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -112,9 +109,9 @@ public class UserUpdateExe {
 
                 // pc端当前相关方企业修改
                 boolean res = userGateway.update(userE);
-                if(!userE.getPhone().equals(userDO.getPhone())
-                || !userE.getEmail().equals(userDO.getEmail())
-                || !userE.getName().equals(userDO.getName())){
+                    if(!Objects.equals(userE.getPhone(), userDO.getPhone())
+                            || !Objects.equals(userE.getEmail(), userDO.getEmail())
+                            || !Objects.equals(userE.getName(), userDO.getName())){
                     // 判断底座是否有该用户信息，如果没有则不调用底座
                     SingleResponse<UserDetailCO> detail = null;
                     try {