From 4262c0d7e1fef31cceeb0125092b1f7baf4a736e Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 6 Aug 2019 10:37:09 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20=E4=BC=98=E5=8C=96=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/service/impl/MenuServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java index d930e7f5..499d9947 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java @@ -72,7 +72,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM return null; } List allMenus = baseMapper.allMenu(); - List roleMenus = (SecureUtil.isAdministrator()) ? allMenus : baseMapper.roleMenu(Func.toLongList(roleId), topMenuId); + List roleMenus = (SecureUtil.isAdministrator() && Func.isEmpty(topMenuId)) ? allMenus : baseMapper.roleMenu(Func.toLongList(roleId), topMenuId); return buildRoutes(allMenus, roleMenus); }