From 2deb45a61bc91225f5598fc7aa5340c18a32c83d Mon Sep 17 00:00:00 2001 From: gtl <2949451835@qq.com> Date: Fri, 12 Apr 2024 18:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=B2=BE=E7=A1=AE=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/service/impl/SysMenuServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index bc32f9d..1d57e83 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -60,9 +60,11 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public List selectMenuList (SysMenu menu, Long userId) { + List allMenuList = null; List menuList = null; + boolean isAdmin = SysUser.isAdmin(userId); // 管理员显示所有菜单信息 - if (SysUser.isAdmin(userId)) { + if (isAdmin) { menuList = menuMapper.selectMenuList(menu); } else { menu.getParams().put("userId", userId); @@ -71,8 +73,11 @@ public class SysMenuServiceImpl extends ServiceImpl impl if(menuList.size()==1){ SysMenu sysMenu = menuList.get(0); this.getMenuList(menuList,sysMenu); - List childList = this.getChildList(menuMapper.selectMenuList(null), sysMenu); + SysMenu newMenu = new SysMenu(); + newMenu.setParams(menu.getParams()); + allMenuList=isAdmin?menuMapper.selectMenuList(null):menuMapper.selectMenuListByUserId(newMenu); //找子节点 + List childList = this.getChildList(allMenuList, sysMenu); menuList.addAll(childList); } return menuList;