From 6a959e84e81ce34065a1d0ee4f190f59b0c0d321 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 十二月 2024 20:43:17 +0800
Subject: [PATCH] 1

---
 se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
index 4b87041..8ff0f74 100644
--- a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
+++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
@@ -21,7 +21,7 @@
 import com.se.common.log.enums.BusinessType;
 import com.se.common.security.annotation.RequiresPermissions;
 import com.se.common.security.utils.SecurityUtils;
-import com.se.system.service.ISysMenuService;
+import com.se.system.service.inte.ISysMenuService;
 
 /**
  * 鑿滃崟淇℃伅
@@ -30,6 +30,7 @@
  */
 @RestController
 @RequestMapping("/menu")
+@SuppressWarnings("ALL")
 public class SysMenuController extends BaseController
 {
     @Autowired
@@ -40,8 +41,14 @@
      */
     @RequiresPermissions("system:menu:list")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
-    {
+    public AjaxResult list(SysMenu menu) {
+        /*if (StringUtils.isEmpty(menu.getMark())) {
+            menu.setMark("sys");
+        }
+        if ("all".equals(menu.getMark())) {
+            menu.setMark(null);
+        }*/
+
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
         return success(menus);
@@ -151,10 +158,16 @@
      * @return 璺敱淇℃伅
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters()
-    {
+    public AjaxResult getRouters(String mark) {
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        if (StringUtils.isEmpty(mark)) {
+            mark = "sys";
+        }
+        if ("all".equals(mark)) {
+            mark = null;
+        }
+
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId, mark);
         return success(menuService.buildMenus(menus));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3