From 780ce46f672ffdb57b4951f9e8f50be32ddd9c39 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 7 Jan 2026 16:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zcloud/basic/info/command/UserAddExe.java | 2 +- .../java/com/zcloud/basic/info/command/UserUpdateExe.java | 6 +++--- 2 files changed, 4 insertions(+), 4 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 5e452aa0..67b691fc 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()); UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone()); - if (userExpandInfoDO.getFlowFlag() != null && !userExpandInfoDO.getFlowFlag().equals(cmd.getFlowFlag())) { + if (userExpandInfoDO!=null &&userExpandInfoDO.getFlowFlag() != null && !userExpandInfoDO.getFlowFlag().equals(cmd.getFlowFlag())) { // 流动转固定 List listByPhone = userRepository.getListByPhone(userDO.getPhone(), Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode())); 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 e0c1993d..7a187535 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 @@ -134,9 +134,9 @@ public class UserUpdateExe { }else { // 企业端/监管端 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 detail = null; try {