From ae3ed0924c3e567da8e8914de09e6d41fc108bd6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 27 十一月 2024 10:34:55 +0800
Subject: [PATCH] 1

---
 se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
index 25c4524..9a8050e 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
+++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
@@ -117,16 +117,14 @@
      */
     @Override
     public List<SysMenu> selectMenuTreeByUserId(Long userId, String mark) {
-        /*List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
-        {
-            menus = menuMapper.selectMenuTreeAll();
+        List<SysMenu> menus = null;
+        if (SecurityUtils.isAdmin(userId)) {
+            menus = menuMapper.selectMenuTreeAll(mark);
+        } else {
+            //menus = menuMapper.selectMenuTreeByUserId(userId, mark);
+            menus = menuMapper.selectMenuTreeByUserId(userId, mark);
         }
-        else
-        {
-            menus = menuMapper.selectMenuTreeByUserId(userId);
-        }*/
-        List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark);
+        //List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark);
 
         return getChildPerms(menus, 0);
     }

--
Gitblit v1.9.3