From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index 9d9fab6..0b1030f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -68,12 +68,14 @@
/**
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
- @GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ @PreAuthorize("@ss.hasAnyPermi('system:role:add,system:role:edit')")
+ @GetMapping(value = {"/roleMenuTreeselect", "/roleMenuTreeselect/{roleId}"})
+ public AjaxResult roleMenuTreeselect(@PathVariable(value = "roleId", required = false) Long roleId)
{
- List<SysMenu> menus = menuService.selectMenuList(getUserId());
+ List<SysMenu> menus = menuService.selectRoleMenuList(getUserId());
AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ ajax.put("checkedKeys", roleId == null ? java.util.Collections.emptyList()
+ : menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return ajax;
}
@@ -162,4 +164,4 @@
}
return toAjax(menuService.deleteMenuById(menuId));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3