From 96647a055b62f080dbc926b8094b032696a791ba Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Fri, 16 Jan 2026 19:09:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(menu):=20=E6=B7=BB=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=B8=AD=E6=98=AF=E5=90=A6=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E6=8C=89=E9=92=AE=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SystemMenuController.java      |  2 +-
 .../cn/odboy/system/service/SystemMenuService.java   | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

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<List<SystemMenuTb>> listMenuByPid(@RequestParam Long pid) {
-    List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuByPid(pid);
+    List<SystemMenuTb> 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<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);
       }