From 3654d020769c0c637e7cb7fea88afdf6618b76e6 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期五, 29 十一月 2024 10:55:02 +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 | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 054c837..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 @@ -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); -- Gitblit v1.9.3