Browse Source

用户列表更新时间修改

tags/24080901
WendyYang 1 year ago
parent
commit
4bc14961f0
2 changed files with 4 additions and 5 deletions
  1. +3
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java
  2. +1
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

+ 3
- 3
pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java View File

@@ -43,6 +43,9 @@ public class MenuManage {
}

public void parentMenuCheck(List<Long> pidList, List<MenuRoleVO> menuRoles, Set<Long> menuIds) {
if (pidList.isEmpty()) {
return;
}
List<Menu> menus = menuService.listByIds(pidList);
if (menus.isEmpty()) {
return;
@@ -56,9 +59,6 @@ public class MenuManage {
List<Long> tmpPidList = tmpSet.stream()
.filter(pid -> !menuIds.contains(pid) && pid != BizConst.PARENT_ID)
.collect(Collectors.toList());
if (tmpPidList.isEmpty()) {
return;
}
parentMenuCheck(tmpPidList, menuRoles, menuIds);
}



+ 1
- 2
pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java View File

@@ -131,8 +131,7 @@ public class UserInfoManage {
List<UserRoleVO> userRoles = getUserRoleVOList(resListVO.getUserId());
resListVO.setUserRoleList(userRoles);
LocalDateTime roleModifyTime;
if ((roleModifyTime = userRoles.get(userRoles.size() - 1).getCreateOn()).isAfter(resListVO.getUpdateTime())
&& CollUtil.isNotEmpty(userRoles)) {
if (CollUtil.isNotEmpty(userRoles) && (roleModifyTime = userRoles.get(userRoles.size() - 1).getCreateOn()).isAfter(resListVO.getUpdateTime())) {
resListVO.setUpdateTime(roleModifyTime);
}
result.add(resListVO);


Loading…
Cancel
Save