From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
index 402f25b..9a1f935 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
@@ -57,7 +57,9 @@
         // 绠$悊鍛樻嫢鏈夋墍鏈夋潈闄�
         if (user.isAdmin())
         {
-            perms.add("*:*:*");
+          //  perms.add("system:*:*");
+            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+
         }
         else
         {

--
Gitblit v1.9.1