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 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 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 detail = null; try {