From bcc59fdd9a1ddc36a9d2095f9b51589181e8ba22 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 28 七月 2025 14:30:57 +0800
Subject: [PATCH] 开机自启动

---
 se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 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 9a03e9f..d354600 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
@@ -9,6 +9,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.se.system.api.domain.SysUser;
 import com.se.system.domain.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,11 +18,10 @@
 import com.se.common.core.utils.StringUtils;
 import com.se.common.security.utils.SecurityUtils;
 import com.se.system.api.domain.SysRole;
-import com.se.system.api.domain.SysUser;
 import com.se.system.domain.vo.*;
 import com.se.system.mapper.SysMenuMapper;
 import com.se.system.mapper.*;
-import com.se.system.service.ISysMenuService;
+import com.se.system.service.inte.ISysMenuService;
 
 /**
  * 鑿滃崟 涓氬姟灞傚鐞�
@@ -29,6 +29,7 @@
  * @author admin
  */
 @Service
+@SuppressWarnings("ALL")
 public class SysMenuServiceImpl implements ISysMenuService {
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 
@@ -68,6 +69,8 @@
             menu.getParams().put("userId", userId);
             menuList = menuMapper.selectMenuListByUserId(menu);
         }
+        //menu.setMenuId(SecurityUtils.isAdmin(userId) ? null : userId);
+
         return menuList;
     }
 
@@ -111,28 +114,19 @@
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
      *
      * @param userId 鐢ㄦ埛鍚嶇О
-     * @param mark   鏍囪瘑
+     * @param mark   鑿滃崟鏍囪瘑
      * @return 鑿滃崟鍒楄〃
      */
     @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);
-
-        return getChildPerms(menus, 0);
-    }
-
-    @Override
-    public List<SysMenu> selectMenusByUserIdAndMark(Long userId, String mark) {
-        List<SysMenu> menus = menuMapper.selectMenusByUserIdAndMark(SecurityUtils.isAdmin(userId) ? null : userId, mark);
+        //List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark);
 
         return getChildPerms(menus, 0);
     }
@@ -337,8 +331,8 @@
     /**
      * 鑾峰彇璺敱鍚嶇О锛屽娌℃湁閰嶇疆璺敱鍚嶇О鍒欏彇璺敱鍦板潃
      *
-     * @param routerName 璺敱鍚嶇О
-     * @param path       璺敱鍦板潃
+     * @param name 璺敱鍚嶇О
+     * @param path 璺敱鍦板潃
      * @return 璺敱鍚嶇О锛堥┘宄版牸寮忥級
      */
     public String getRouteName(String name, String path) {

--
Gitblit v1.9.3