From 0c8b23d11c783e81a8365907072f1da5648752d8 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 16 May 2024 13:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.7=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AE=BE=E8=AE=A1=E7=9A=84=E8=A7=86=E5=9B=BE?= =?UTF-8?q?id?= 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 | 4 ++-- 3 files changed, 9 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 8678081c0..f29342062 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 @@ -89,6 +89,12 @@ public class IndexUserMenuInfo implements AbstractTreeNode { @ChineseDescription("应用设计的业务id") private Long appDesignBusinessId; + /** + * 应用设计的视图id + */ + @ChineseDescription("应用设计的视图id") + private Long appDesignViewId; + /** * 子级菜单 */ 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 f132d319c..899159f62 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 @@ -370,6 +370,7 @@ public class UserIndexInfoService { indexUserMenuInfo.setComponent(userMenuItem.getAntdvComponent()); indexUserMenuInfo.setSortNumber(userMenuItem.getMenuSort()); indexUserMenuInfo.setAppDesignBusinessId(userMenuItem.getAppDesignBusinessId()); + indexUserMenuInfo.setAppDesignViewId(userMenuItem.getAppDesignViewId()); 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 9385e4e5c..ca8c0edd2 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 @@ -124,7 +124,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl sysMenuLambdaQueryWrapper.select(SysMenu::getAppId, SysMenu::getMenuName, SysMenu::getMenuCode, SysMenu::getMenuSort, SysMenu::getMenuType, SysMenu::getAntdvComponent, SysMenu::getAntdvRouter, SysMenu::getAntdvVisible, SysMenu::getAntdvActiveUrl, SysMenu::getAntdvLinkUrl, SysMenu::getAntdvIcon, SysMenu::getMenuParentId, - SysMenu::getAppDesignBusinessId); + SysMenu::getAppDesignBusinessId, SysMenu::getAppDesignViewId); SysMenu sysMenu = this.getOne(sysMenuLambdaQueryWrapper, false); @@ -222,7 +222,7 @@ 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::getAppDesignBusinessId); + SysMenu::getAppDesignBusinessId, SysMenu::getAppDesignViewId); sysMenuLambdaQueryWrapper.orderByAsc(SysMenu::getMenuSort);