From 88d3cabf8a7aa84569ced951379408530126b4fd Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 7 Dec 2021 15:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E7=9A=84=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/modular/menu/service/impl/SysMenuServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java index 2a735f5c9..54653b874 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java @@ -44,7 +44,6 @@ import cn.stylefeng.roses.kernel.system.api.MenuServiceApi; import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.api.exception.enums.menu.SysMenuExceptionEnum; -import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserExceptionEnum; import cn.stylefeng.roses.kernel.system.api.pojo.menu.MenuAndButtonTreeResponse; import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuRequest; import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdMenuSelectTreeNode; @@ -482,7 +481,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 非超级管理员，获取当前用户所有的菜单id List menuIdList = getCurrentUserMenuIds(); if (menuIdList.isEmpty()) { - throw new SystemModularException(SysUserExceptionEnum.USER_NOT_HAVE_MENUS); + return new ArrayList<>(); } queryWrapper.in(SysMenu::getMenuId, menuIdList); @@ -553,7 +552,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (ObjectUtil.isEmpty(businessIds)) { return new ArrayList<>(); } - + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(SysMenuResource::getBusinessId, businessIds); wrapper.select(SysMenuResource::getResourceCode);