From d0b5a768e8ebc277022cfc8e24375453404aa1c8 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 15 Jun 2023 09:26:27 +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=90permission=E3=80=91=E5=B0=81=E8=A3=85=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modular/menu/service/SysMenuService.java | 8 ++++++++ .../menu/service/impl/SysMenuServiceImpl.java | 14 ++++++++++++-- .../service/impl/PermissionAssignServiceImpl.java | 5 +---- .../role/service/impl/RoleBindTotalImpl.java | 5 +---- 4 files changed, 22 insertions(+), 10 deletions(-) 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 779b29956..e96d87e84 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 @@ -77,4 +77,12 @@ public interface SysMenuService extends IService { */ Long getMenuAppId(Long menuId); + /** + * 获取所有的菜单信息，用在角色绑定权限界面 + * + * @author fengshuonan + * @since 2023/6/15 9:24 + */ + List getTotalMenus(); + } \ 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 d43d46d24..10d6fe671 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 @@ -91,6 +91,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl } } + @Override + public List getTotalMenus() { + LambdaQueryWrapper menuLambdaQueryWrapper = new LambdaQueryWrapper<>(); + menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId); + menuLambdaQueryWrapper.orderByAsc(SysMenu::getMenuSort); + return this.list(menuLambdaQueryWrapper); + } + @Override public List getAppMenuGroupDetail(SysMenuRequest sysMenuRequest) { @@ -106,7 +114,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 2. 获取应用对应的所有菜单 LambdaQueryWrapper wrapper = this.createWrapper(sysMenuRequest); wrapper.in(SysMenu::getAppId, totalAppIds); - wrapper.select(SysMenu::getMenuId, SysMenu::getMenuParentId, SysMenu::getMenuPids, SysMenu::getMenuName, SysMenu::getAppId, SysMenu::getMenuType); + wrapper.select(SysMenu::getMenuId, SysMenu::getMenuParentId, SysMenu::getMenuPids, SysMenu::getMenuName, SysMenu::getAppId, + SysMenu::getMenuType); List sysMenuList = this.list(wrapper); if (ObjectUtil.isEmpty(sysMenuList)) { return appList; @@ -118,7 +127,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (ObjectUtil.isNotEmpty(menuParentIds)) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(SysMenu::getMenuId, menuParentIds); - queryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuParentId, SysMenu::getMenuPids, SysMenu::getMenuName, SysMenu::getAppId, SysMenu::getMenuType); + queryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuParentId, SysMenu::getMenuPids, SysMenu::getMenuName, + SysMenu::getAppId, SysMenu::getMenuType); queryWrapper.orderByAsc(SysMenu::getMenuSort); List parentMenus = this.list(queryWrapper); sysMenuList.addAll(parentMenus); diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java index b9e8ad2f9..af39914ed 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java @@ -74,10 +74,7 @@ public class PermissionAssignServiceImpl implements PermissionAssignService { public RoleBindPermissionResponse createSelectTreeStructure() { // 获取所有的菜单 - LambdaQueryWrapper menuLambdaQueryWrapper = new LambdaQueryWrapper<>(); - menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId); - menuLambdaQueryWrapper.orderByAsc(SysMenu::getMenuSort); - List totalMenus = this.sysMenuService.list(menuLambdaQueryWrapper); + List totalMenus = this.sysMenuService.getTotalMenus(); // 组装所有的叶子节点菜单【初始化菜单】 List totalResultMenus = PermissionAssignFactory.createPermissionMenus(totalMenus); diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java index 8f87c160d..e90f95a22 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java @@ -61,10 +61,7 @@ public class RoleBindTotalImpl implements RoleAssignOperateAction { if (roleBindPermissionRequest.getChecked()) { // 获取所有的菜单 - LambdaQueryWrapper menuLambdaQueryWrapper = new LambdaQueryWrapper<>(); - menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId); - menuLambdaQueryWrapper.orderByAsc(SysMenu::getMenuSort); - List totalMenus = this.sysMenuService.list(menuLambdaQueryWrapper); + List totalMenus = this.sysMenuService.getTotalMenus(); // 绑定角色的所有菜单 List sysRoleMenuList = new ArrayList<>();