From 976b7f2e1715b8e2802df6f36263f0d36b3b7268 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 19 Jun 2023 22:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90=E9=A6=96=E9=A1=B5=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=E8=8F=9C=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=94=E7=94=A8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modular/login/service/UserIndexInfoService.java | 2 +- .../kernel/sys/modular/menu/service/SysMenuService.java | 4 ++-- .../sys/modular/menu/service/impl/SysMenuServiceImpl.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java index 8c32fc7af..5db0e9ace 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java @@ -192,7 +192,7 @@ public class UserIndexInfoService { HashSet permissionCodeList = new HashSet<>(); // 获取菜单对应的菜单编码集合 - List menuInfoList = sysMenuService.getMenuCodeList(menuIdList); + List menuInfoList = sysMenuService.getIndexMenuInfoList(menuIdList); Set menuCodeList = menuInfoList.stream().map(SysMenu::getMenuCode).collect(Collectors.toSet()); permissionCodeList.addAll(menuCodeList); diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java index ceb34d3a7..4c64be2ac 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java @@ -105,13 +105,13 @@ public interface SysMenuService extends IService { List getTotalMenuList(); /** - * 获取菜单对应的菜单编码，以及菜单id、菜单名称、菜单图标、菜单是否隐藏、菜单激活地址、菜单路由、组件路径、排序信息 + * 获取菜单对应的菜单编码，以及菜单id、应用id，菜单名称、菜单图标、菜单是否隐藏、菜单激活地址、菜单路由、组件路径、排序信息 *

* 用在用户登录后，获取用户首页信息接口 * * @author fengshuonan * @since 2023/6/19 12:53 */ - List getMenuCodeList(List menuIdList); + List getIndexMenuInfoList(List menuIdList); } \ No newline at end of file diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java index 02672c8b8..27cd3f86f 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java @@ -178,7 +178,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } @Override - public List getMenuCodeList(List menuIdList) { + public List getIndexMenuInfoList(List menuIdList) { if (ObjectUtil.isEmpty(menuIdList)) { return new ArrayList<>(); @@ -189,9 +189,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl sysMenuLambdaQueryWrapper.in(SysMenu::getMenuId, menuIdList); // 查询指定的菜单内容 - sysMenuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuCode, SysMenu::getMenuName, SysMenu::getAntdvIcon, - SysMenu::getAntdvVisible, SysMenu::getAntdvActiveUrl, SysMenu::getAntdvRouter, SysMenu::getAntdvComponent, - SysMenu::getMenuSort); + sysMenuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getAppId, SysMenu::getMenuCode, SysMenu::getMenuName, + SysMenu::getAntdvIcon, SysMenu::getAntdvVisible, SysMenu::getAntdvActiveUrl, SysMenu::getAntdvRouter, + SysMenu::getAntdvComponent, SysMenu::getMenuSort); return this.list(sysMenuLambdaQueryWrapper); }