From 92786e22bbc0c6d99fac274bfa67d09c6772597a Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期二, 10 九月 2024 11:10:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/se-cloud

---
 se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 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..6dfeba5 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
@@ -151,10 +151,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