From 96a0ff445979e021b8c4a47b247385ad5d8a0f3a Mon Sep 17 00:00:00 2001 From: sugy <455459989@qq.com> Date: Thu, 22 Jan 2026 10:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=9A=E4=B8=AA=E8=A7=92?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nov/KgLowDurable/controller/MenuController.java | 4 ++-- .../com/nov/KgLowDurable/service/IMenuService.java | 2 +- .../KgLowDurable/service/Impl/MenuServiceImpl.java | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/nov/KgLowDurable/controller/MenuController.java b/src/main/java/com/nov/KgLowDurable/controller/MenuController.java index 105c5b5..912d347 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/MenuController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/MenuController.java @@ -131,8 +131,8 @@ public class MenuController { */ @GetMapping("/routes") @ApiOperation(value = "前端菜单数据", notes = "前端菜单数据") - public Result> routes(String roleId, Long topMenuId) { - List list = menuService.routes((roleId == null) ? null : roleId, topMenuId); + public Result> routes(String roleIds, Long topMenuId) { + List list = menuService.routes((roleIds== null) ? null : roleIds, topMenuId); return Result.OK(list); } /** diff --git a/src/main/java/com/nov/KgLowDurable/service/IMenuService.java b/src/main/java/com/nov/KgLowDurable/service/IMenuService.java index 7ff446a..e5e74f1 100644 --- a/src/main/java/com/nov/KgLowDurable/service/IMenuService.java +++ b/src/main/java/com/nov/KgLowDurable/service/IMenuService.java @@ -42,7 +42,7 @@ public interface IMenuService extends IService { * @param topMenuId * @return */ - List routes(String roleId, Long topMenuId); + List routes(String roleIds, Long topMenuId); /** * 菜单树形结构 diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java index cda0aa4..b4021a9 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/MenuServiceImpl.java @@ -61,21 +61,21 @@ public class MenuServiceImpl extends ServiceImpl implements IM } @Override - public List routes(String roleId, Long topMenuId) { + public List routes(String roleIds, Long topMenuId) { // if (StringUtils.isBlank(roleId)) { // return null; // } List allMenus = baseMapper.allMenu(); List roleMenus = null; - Role role=roleService.getById(roleId); + //Role role=roleService.getById(roleId); // 超级管理员并且不是顶部菜单请求则返回全部菜单 - if ((Func.isEmpty(roleId)||role.getCode().equals(RoleConstant.ADMINISTRATOR))&&Func.isEmpty(topMenuId)) { + if ((Func.isEmpty(roleIds))&&Func.isEmpty(topMenuId)) { roleMenus = allMenus; } // 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单 - else if (role!=null&&!role.getName().equals("超级管理员")&&Func.isEmpty(topMenuId)) { + else if (roleIds!=null&&Func.isEmpty(topMenuId)) { // 角色配置对应菜单 - List roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId)); + List roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleIds)); // 反向递归角色菜单所有父级 List routes = new LinkedList<>(roleIdMenus); roleIdMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu)); @@ -84,7 +84,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM // 顶部菜单请求返回对应角色权限菜单 else { // 角色配置对应菜单 - List roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId)); + List roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleIds)); // 反向递归角色菜单所有父级 List routes = new LinkedList<>(roleIdMenus); roleIdMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));