From 4f7362ec2854732c2ff2454331ec815c4c3147f0 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 22 十一月 2024 11:08:59 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud
---
se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..054c837 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;
/**
* 鑿滃崟淇℃伅
@@ -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