diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java index dfd6174..2fe0134 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java @@ -111,8 +111,8 @@ public class UserInfoManage { resListVO.setOrgCode(organizationCode); String regionCode = orgMap.get(organizationCode).getDivisionCode(); resListVO.setRegionCode(regionCode); - if(Objects.nonNull(regionCode)){ - resListVO.setRegionName(regionCacheHelper.getDisplayName(regionCode,RegionConst.RL_COUNTY)); + if (Objects.nonNull(regionCode)) { + resListVO.setRegionName(regionCacheHelper.getDisplayName(regionCode, RegionConst.RL_COUNTY)); } } // TODO 从用户信息中获取 @@ -121,7 +121,12 @@ public class UserInfoManage { UserInfo userInfo = finalEmployeeCodeAvailableMap.get(r.getEmployeeCode()); // 装配用户状态 及 userId userStatusAssembler(resListVO, userInfo); - resListVO.setUpdateTime(r.getUpdateOn()); + + if (Objects.isNull(userInfo)) { + resListVO.setUpdateTime(r.getUpdateOn()); + } else { + resListVO.setUpdateTime(userInfo.getUpdateOn()); + } // 从用户信息中获取 resListVO.setEmployeeCode(r.getEmployeeCode()); resListVO.setUserRoleList(getUserRoleVOList(resListVO.getUserId()));