From 1b51e659b8d79306d967c42d006879e5fbfa7e67 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 25 Jun 2023 09:36:31 +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=90user=E3=80=91=E9=A6=96=E9=A1=B5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8F=9C=E5=8D=95=E7=B1=BB=E5=9E=8B?= 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 | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java index 21436861a..7bdef45c4 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java @@ -29,6 +29,12 @@ public class IndexUserMenuInfo implements AbstractTreeNode { @ChineseDescription("菜单父级id") private Long menuParentId; + /** + * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接 + */ + @ChineseDescription("菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接") + private Integer menuType; + /** * 菜单的名称 */ 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 0a7b45086..876f9868e 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 @@ -309,6 +309,7 @@ public class UserIndexInfoService { IndexUserMenuInfo indexUserMenuInfo = new IndexUserMenuInfo(); indexUserMenuInfo.setMenuId(userMenuItem.getMenuId()); indexUserMenuInfo.setMenuParentId(userMenuItem.getMenuParentId()); + indexUserMenuInfo.setMenuType(userMenuItem.getMenuType()); indexUserMenuInfo.setTitle(userMenuItem.getMenuName()); indexUserMenuInfo.setIcon(userMenuItem.getAntdvIcon()); indexUserMenuInfo.setHide(YesOrNotEnum.N.getCode().equals(userMenuItem.getAntdvVisible())); 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 ff91f99f6..7debbba4a 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 @@ -190,7 +190,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 查询指定的菜单内容 sysMenuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuParentId, SysMenu::getAppId, SysMenu::getMenuCode, - SysMenu::getMenuName, + SysMenu::getMenuName, SysMenu::getMenuType, SysMenu::getAntdvIcon, SysMenu::getAntdvVisible, SysMenu::getAntdvActiveUrl, SysMenu::getAntdvRouter, SysMenu::getAntdvComponent, SysMenu::getMenuSort);