diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 52ccb297..28a400cc 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -68,7 +68,7 @@ public class SystemMenuController { @PostMapping(value = "/listMenuByPid") @PreAuthorize("@el.check('menu:list','roles:list')") public ResponseEntity> listMenuByPid(@RequestParam Long pid) { - List systemMenuTbs = systemMenuService.listMenuByPid(pid); + List systemMenuTbs = systemMenuService.listMenuByPid(pid, false); return ResponseEntity.ok(systemMenuTbs); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 989eadec..39082d81 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -243,11 +243,15 @@ public class SystemMenuService { * @param pid / * @return / */ - public List listMenuByPid(Long pid) { + public List listMenuByPid(Long pid, boolean includeButton) { List menus; if (pid != null && !pid.equals(0L)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemMenuTb::getPid, pid); + if (!includeButton) { + // 是否剔除按钮 + wrapper.ne(SystemMenuTb::getType, 2); + } wrapper.orderByAsc(SystemMenuTb::getMenuSort); return systemMenuMapper.selectList(wrapper); } else { @@ -268,7 +272,7 @@ public class SystemMenuService { menus.addAll(this.listRootMenu()); return menus; } - menus.addAll(this.listMenuByPid(menu.getPid())); + menus.addAll(this.listMenuByPid(menu.getPid(), true)); return querySuperiorMenuByArgs(this.getMenuById(menu.getPid()), menus); } @@ -389,7 +393,7 @@ public class SystemMenuService { List newMenuList = new ArrayList<>(menus); return this.buildMenuTree(newMenuList); } else { - List records = this.listMenuByPid(null); + List records = this.listMenuByPid(null, true); return KitBeanUtil.copyToList(records, SystemMenuVo.class); } } @@ -577,7 +581,7 @@ public class SystemMenuService { private Set queryChildMenuByArgs(List menuList, Set menuSet) { for (SystemMenuTb menu : menuList) { menuSet.add(menu); - List menus = this.listMenuByPid(menu.getId()); + List menus = this.listMenuByPid(menu.getId(), true); if (CollUtil.isNotEmpty(menus)) { queryChildMenuByArgs(menus, menuSet); }