|
@@ -62,7 +62,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
|
|
public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
|
|
List<SysMenu> menuList = null;
|
|
List<SysMenu> menuList = null;
|
|
// 管理员显示所有菜单信息
|
|
// 管理员显示所有菜单信息
|
|
- if (SysUser.isAdmin(userId)) {
|
|
|
|
|
|
+ if (SysUser.isAdmin(userId) || UserUtil.getUserRoleIds(userId).contains(1L)) {
|
|
menuList = menuMapper.selectMenuList(menu);
|
|
menuList = menuMapper.selectMenuList(menu);
|
|
} else {
|
|
} else {
|
|
menu.getParams().put("userId", userId);
|
|
menu.getParams().put("userId", userId);
|