zcloud_gbs
/
zcloud_gbs_basic_info_gwj
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

空指针校验

dev_xiangguanfang
zhaokai 2026-01-05 13:58:24 +08:00
parent 6baf6a0dd8
commit e269ab1399
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -191,7 +191,7 @@ public class UserAddExe {
// userRepository.checkUserIdCard(cmd.getId(),cmd.getUserIdCard()); // userRepository.checkUserIdCard(cmd.getId(),cmd.getUserIdCard());
if (userDO.getFlowFlag() != null && !userDO.getFlowFlag().equals(cmd.getFlowFlag())) { 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())); 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 (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; SingleResponse<UserDetailCO> detail = null;
try { try {

11
web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
View File

@ -38,10 +38,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -112,9 +109,9 @@ public class UserUpdateExe {
// pc端当前相关方企业修改 // pc端当前相关方企业修改
boolean res = userGateway.update(userE); boolean res = userGateway.update(userE);
if(!userE.getPhone().equals(userDO.getPhone()) if(!Objects.equals(userE.getPhone(), userDO.getPhone())
|| !userE.getEmail().equals(userDO.getEmail()) || !Objects.equals(userE.getEmail(), userDO.getEmail())
|| !userE.getName().equals(userDO.getName())){ || !Objects.equals(userE.getName(), userDO.getName())){
// 判断底座是否有该用户信息，如果没有则不调用底座 // 判断底座是否有该用户信息，如果没有则不调用底座
SingleResponse<UserDetailCO> detail = null; SingleResponse<UserDetailCO> detail = null;
try { try {