From e31c0e79e02ca1e07addf37ab86577cd1b0e2495 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 10 Jan 2024 17:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0.5=E3=80=91=E3=80=90system=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=A0=E4=B8=8A=E4=B8=9A=E5=8A=A1id=E7=9A=84?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/sys/modular/login/pojo/IndexUserMenuInfo.java | 6 ++++++ .../sys/modular/login/service/UserIndexInfoService.java | 1 + .../sys/modular/menu/service/impl/SysMenuServiceImpl.java | 6 ++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java index 36e5abef6..8678081c0 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java @@ -83,6 +83,12 @@ public class IndexUserMenuInfo implements AbstractTreeNode { @ChineseDescription("路由元信息") private String meta; + /** + * 应用设计的业务id + */ + @ChineseDescription("应用设计的业务id") + private Long appDesignBusinessId; + /** * 子级菜单 */ diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java index df40d075b..ccf7c584d 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java @@ -358,6 +358,7 @@ public class UserIndexInfoService { indexUserMenuInfo.setPath(userMenuItem.getAntdvRouter()); indexUserMenuInfo.setComponent(userMenuItem.getAntdvComponent()); indexUserMenuInfo.setSortNumber(userMenuItem.getMenuSort()); + indexUserMenuInfo.setAppDesignBusinessId(userMenuItem.getAppDesignBusinessId()); appMenuList.add(indexUserMenuInfo); } } diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java index 43d80d8f6..52d251b9b 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java @@ -158,7 +158,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List getTotalMenus(Set limitMenuIds) { LambdaQueryWrapper menuLambdaQueryWrapper = new LambdaQueryWrapper<>(); - menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId, SysMenu::getMenuSort); + menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId, + SysMenu::getMenuSort); // 如果限制菜单不为空，则根据限制菜单id进行筛选，否则查询所有菜单 if (ObjectUtil.isNotEmpty(limitMenuIds)) { @@ -219,7 +220,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 查询指定的菜单内容 sysMenuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuParentId, SysMenu::getMenuPids, SysMenu::getAppId, SysMenu::getMenuCode, SysMenu::getMenuName, SysMenu::getMenuType, SysMenu::getAntdvIcon, SysMenu::getAntdvVisible, - SysMenu::getAntdvActiveUrl, SysMenu::getAntdvRouter, SysMenu::getAntdvComponent, SysMenu::getMenuSort); + SysMenu::getAntdvActiveUrl, SysMenu::getAntdvRouter, SysMenu::getAntdvComponent, SysMenu::getMenuSort, + SysMenu::getAppDesignBusinessId); sysMenuLambdaQueryWrapper.orderByAsc(SysMenu::getMenuSort);