odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(menu): 添加菜单查询中是否包含按钮类型的参数控制

Browse Source
This commit is contained in:
odboy
2026-01-16 19:09:33 +08:00
parent 02bff29f94
commit 96647a055b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class SystemMenuController {
@PostMapping(value = "/listMenuByPid")
@PreAuthorize("@el.check('menu:list','roles:list')")
public ResponseEntity<List<SystemMenuTb>> listMenuByPid(@RequestParam Long pid) {
List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuByPid(pid);
List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuByPid(pid, false);
return ResponseEntity.ok(systemMenuTbs);
}
cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
+8 -4
View File
@@ -243,11 +243,15 @@ public class SystemMenuService {
* @param pid /
* @return /
*/
public List<SystemMenuTb> listMenuByPid(Long pid) {
public List<SystemMenuTb> listMenuByPid(Long pid, boolean includeButton) {
List<SystemMenuTb> menus;
if (pid != null && !pid.equals(0L)) {
LambdaQueryWrapper<SystemMenuTb> 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<SystemMenuTb> newMenuList = new ArrayList<>(menus);
return this.buildMenuTree(newMenuList);
} else {
List<SystemMenuTb> records = this.listMenuByPid(null);
List<SystemMenuTb> records = this.listMenuByPid(null, true);
return KitBeanUtil.copyToList(records, SystemMenuVo.class);
}
}
@@ -577,7 +581,7 @@ public class SystemMenuService {
private Set<SystemMenuTb> queryChildMenuByArgs(List<SystemMenuTb> menuList, Set<SystemMenuTb> menuSet) {
for (SystemMenuTb menu : menuList) {
menuSet.add(menu);
List<SystemMenuTb> menus = this.listMenuByPid(menu.getId());
List<SystemMenuTb> menus = this.listMenuByPid(menu.getId(), true);
if (CollUtil.isNotEmpty(menus)) {
queryChildMenuByArgs(menus, menuSet);
}