From 13d838aea1c7983e8dfdcbe0047d2aaad1738cf7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 18 Dec 2023 17:23:42 +0800
Subject: [PATCH] 公益报名+议事添加签名地址+菜单过滤
---
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index 0cfc419..880f37d 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -110,19 +110,19 @@
@Override
- public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType) {
+ public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType,Integer menuType) {
if (StringUtil.isBlank(roleId)) {
return null;
}
- List<Menu> allMenus = baseMapper.allMenu();
+ List<Menu> allMenus = baseMapper.selectList(Wrappers.<Menu>lambdaQuery().eq(Menu::getCategory,1).eq(Menu::getMenuType,menuType));
List<Menu> roleMenus;
// 超级管理员并且不是顶部菜单请求则返回全部菜单
if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
- roleMenus = allMenus.stream().filter(a -> a.getMenuType().equals(0)).collect(Collectors.toList());
+ roleMenus = allMenus;
}
// 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单
else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
- roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId)));
+ roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
UserHouseLabelDTO userHouseLabelDTO = new UserHouseLabelDTO();
userHouseLabelDTO.setUserId(AuthUtil.getUserId());
userHouseLabelDTO.setLableType(labelType);
@@ -167,7 +167,7 @@
// 顶部菜单请求返回对应角色权限菜单
else {
// 角色配置对应菜单
- List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId));
+ List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId),menuType);
// 反向递归角色菜单所有父级
List<Menu> routes = new LinkedList<>(roleIdMenus);
roleIdMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
--
Gitblit v1.9.3