From 1c7ba5c0d6f2dbb95e916aa45eec32a94103a96f Mon Sep 17 00:00:00 2001
From: dongdong.xiang <boolean1135@gmail.com>
Date: Sun, 16 Jun 2024 22:41:32 +0800
Subject: [PATCH] 【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点

---
 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java | 3 ++-
 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java   | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
index 20e9e9d..6ebaba2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
@@ -109,9 +109,10 @@ public class AuthController {
         // 1.3 获得菜单列表
         Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
         List<MenuDO> menuList = menuService.getMenuList(menuIds);
-        // 过滤掉关闭的菜单及其子菜单
+        // 过滤掉关闭的菜单
         menuList = menuService.filterClosedMenus(menuList);
 
+        menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
         // 2. 拼接结果返回
         return success(AuthConvert.INSTANCE.convert(user, roles, menuList));
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
index bba798f..104da07 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
@@ -126,16 +126,18 @@ public class MenuServiceImpl implements MenuService {
         if(CollectionUtils.isEmpty(menuList)){
             return Collections.emptyList();
         }
+        List<MenuDO> allMenuList = getMenuList();
+
         // 根据parentId快速查找子节点
-        Map<Long, List<MenuDO>> childrenMap = menuList.stream()
+        Map<Long, List<MenuDO>> childrenMap = allMenuList.stream()
                 .collect(Collectors.groupingBy(MenuDO::getParentId));
 
         // 所有关闭的节点ID
         Set<Long> closedNodeIds = new HashSet<>();
 
         // 标记所有关闭的节点
-        for (MenuDO menu : menuList) {
-            if (Objects.equals(menu.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
+        for (MenuDO menu : allMenuList) {
+            if (!Objects.equals(menu.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
                 markClosedNodes(menu.getId(), childrenMap, closedNodeIds);
             }
         }
--
libgit2 0.21.4