From e5f439aecd04dc759dbbcde6c1f71c875f7b91af Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 31 Aug 2024 08:16:31 +0800
Subject: [PATCH] =?UTF-8?q?1063=20=E3=80=90=E8=BD=BB=E9=87=8F=E7=BA=A7=20P?=
 =?UTF-8?q?R=E3=80=91=EF=BC=9A=E5=85=B3=E9=97=AD=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=BC=9A=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/permission/MenuServiceImpl.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 730958f82..98052eb65 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
@@ -140,17 +140,19 @@ public class MenuServiceImpl implements MenuService {
             return true;
         }
 
-        // 1. 遍历到 parentId 为根节点，则无需判断
+        // 1. 先判断自身是否禁用
+        if (CommonStatusEnum.isDisable(node.getStatus())) {
+            disabledMenuCache.add(node.getId());
+            return true;
+        }
+
+        // 2. 遍历到 parentId 为根节点，则无需判断
         Long parentId = node.getParentId();
         if (ObjUtil.equal(parentId, ID_ROOT)) {
-            if (CommonStatusEnum.isDisable(node.getStatus())) {
-                disabledMenuCache.add(node.getId());
-                return true;
-            }
             return false;
         }
 
-        // 2. 继续遍历 parent 节点
+        // 3. 继续遍历 parent 节点
         MenuDO parent = menuMap.get(parentId);
         if (parent == null || isMenuDisabled(parent, menuMap, disabledMenuCache)) {
             disabledMenuCache.add(node.getId());