From 30df6a7049f674827fcf80520e87fc40b780ffe8 Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期五, 29 十一月 2024 09:21:38 +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 | 24 ++++++++++++++++++------
1 files changed, 18 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 e7cdf65..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,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));
}
--
Gitblit v1.9.3