diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index 7d0ca00..bdf6afa 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -96,7 +96,10 @@ public class SysMenuController extends BaseController { @SaCheckPermission("system:menu:query") @GetMapping(value = "/roleMenuTreeselect/{roleId}") public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { - List menus = menuService.selectMenuList(LoginHelper.getUserId()); + // 只查询可见的菜单(visible='0') + SysMenuBo menuQuery = new SysMenuBo(); + menuQuery.setVisible("0"); + List menus = menuService.selectMenuList(menuQuery, LoginHelper.getUserId()); MenuTreeSelectVo selectVo = new MenuTreeSelectVo( menuService.selectMenuListByRoleId(roleId), menuService.buildMenuTreeSelect(menus)); diff --git a/frontend/ruoyi-ui/src/views/system/role/index.vue b/frontend/ruoyi-ui/src/views/system/role/index.vue index 469cd88..5426fa3 100644 --- a/frontend/ruoyi-ui/src/views/system/role/index.vue +++ b/frontend/ruoyi-ui/src/views/system/role/index.vue @@ -378,7 +378,7 @@ function handleAuthUser(row) { /** 查询菜单树结构 */ function getMenuTreeselect() { menuTreeselect().then(response => { - menuOptions.value = response.data + menuOptions.value = response.data || [] }) } @@ -450,16 +450,16 @@ function handleUpdate(row) { /** 根据角色ID查询菜单树结构 */ function getRoleMenuTreeselect(roleId) { return roleMenuTreeselect(roleId).then(response => { - menuOptions.value = response.menus - return response + menuOptions.value = response.data.menus + return response.data }) } /** 根据角色ID查询部门树结构 */ function getDeptTree(roleId) { return deptTreeSelect(roleId).then(response => { - deptOptions.value = response.depts - return response + deptOptions.value = response.data.depts + return response.data }) }