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

---
 se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 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..47f6da2 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;
 
 /**
  * 鑿滃崟淇℃伅
@@ -40,8 +40,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 +157,30 @@
      * @return 璺敱淇℃伅
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters()
+    public AjaxResult getRouters(String mark) {
+        Long userId = SecurityUtils.getUserId();
+        if (StringUtils.isEmpty(mark)) {
+            mark = "sys";
+        }
+        if ("all".equals(mark)) {
+            mark = null;
+        }
+
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId, mark);
+        return success(menuService.buildMenus(menus));
+    }
+
+    /**
+     * 鏍规嵁鏍囪瘑鑾峰彇鑿滃崟
+     *
+     * @return 鑿滃崟
+     */
+    @GetMapping("getMenusByMark")
+    public AjaxResult getMenusByMark(String mark)
     {
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
-        return success(menuService.buildMenus(menus));
+        List<SysMenu> menus = menuService.selectMenusByUserIdAndMark(userId, mark);
+
+        return success(menus);
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3