diff --git a/src/main/java/com/chinaweal/aiccs/org/controller/TUsermenuController.java b/src/main/java/com/chinaweal/aiccs/org/controller/TUsermenuController.java index b113a22..e900e22 100644 --- a/src/main/java/com/chinaweal/aiccs/org/controller/TUsermenuController.java +++ b/src/main/java/com/chinaweal/aiccs/org/controller/TUsermenuController.java @@ -63,7 +63,7 @@ public class TUsermenuController extends BaseController { wrapper.eq(TUsermenu::getUserID, userId); List usermenus = tUsermenuService.list(wrapper); if (CollectionUtils.isEmpty(usermenus)) { - return RestResult.error(ResultCode.DATA_NONE,"该用户未配置权限"); + return RestResult.error(ResultCode.DATA_NONE, "该用户未配置权限"); } ArrayList sysMenuIds = new ArrayList<>(); for (TUsermenu usermenu : usermenus) { @@ -97,7 +97,7 @@ public class TUsermenuController extends BaseController { if (userMenus.size() > 0) { return RestResult.ok(userMenus); } else { - return RestResult.error(ResultCode.DATA_NONE,"该用户未配置权限"); + return RestResult.error(ResultCode.DATA_NONE, "该用户未配置权限"); } } return RestResult.error(ResultCode.PARAM_IS_INVALID); @@ -238,7 +238,7 @@ public class TUsermenuController extends BaseController { //进行组装层级 return RestResult.ok(assemble(userMenus)); } else { - return RestResult.error(ResultCode.DATA_NONE,"该用户未配置权限"); + return RestResult.error(ResultCode.DATA_NONE, "该用户未配置权限"); } } @@ -263,7 +263,7 @@ public class TUsermenuController extends BaseController { */ private List findChildren(UserMenusDto userMenusDto, List dbList) { List children = dbList.stream() - .filter(item -> (item.getPid().equals(userMenusDto.getSysMenuId()) && StringUtils.isNotBlank(item.getPath()))) + .filter(item -> (StringUtils.equals(item.getPid(), userMenusDto.getSysMenuId()) && StringUtils.isNotBlank(item.getPath()))) .collect(Collectors.toList()); for (UserMenusDto child : children) { child.setChildren(findChildren(child, dbList)); @@ -288,7 +288,7 @@ public class TUsermenuController extends BaseController { if (b) { continue; //存在跳出 } - if(StringUtils.isNotBlank(sysMenu.getParentID())) { + if (StringUtils.isNotBlank(sysMenu.getParentID())) { SysMenu pSysMenu = sysMenuService.getById(sysMenu.getParentID()); if (pSysMenu != null) { list.add(pSysMenu);