huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 15:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点

Browse Source
This commit is contained in:
dongdong.xiang 2024-06-16 21:21:55 +08:00
parent 312f7e4890
commit 6419aef36c
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
View File

@ -109,6 +109,8 @@ public class AuthController {
// 1.3 获得菜单列表
Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
List<MenuDO> menuList = menuService.getMenuList(menuIds);
// 过滤掉关闭的菜单及其子菜单
menuList = menuService.filterClosedMenus(menuList);
// 2. 拼接结果返回
return success(AuthConvert.INSTANCE.convert(user, roles, menuList));

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
View File

@ -71,7 +71,9 @@ public class MenuController {
"在多租户的场景下，会只返回租户所在套餐有的菜单")
public CommonResult<List<MenuSimpleRespVO>> getSimpleMenuList() {
List<MenuDO> list = menuService.getMenuListByTenant(
new MenuListReqVO());
new MenuListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
// 过滤掉关闭的菜单及其子菜单
list = menuService.filterClosedMenus(list);
list.sort(Comparator.comparing(MenuDO::getSort));
return success(BeanUtils.toBean(list, MenuSimpleRespVO.class));
}

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java
View File

@ -52,6 +52,14 @@ public interface MenuService {
*/
List<MenuDO> getMenuListByTenant(MenuListReqVO reqVO);
/**
* 过滤掉关闭的菜单及其子菜单
*
* @param menuList
* @return
*/
List<MenuDO> filterClosedMenus(List<MenuDO> menuList);
/**
* 筛选菜单列表
*

28
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
View File

@ -109,7 +109,7 @@ public class MenuServiceImpl implements MenuService {
@Override
public List<MenuDO> getMenuListByTenant(MenuListReqVO reqVO) {
// 查询所有菜单，并过滤掉关闭的节点
List<MenuDO> menus = filterClosedNodes(getMenuList(reqVO));
List<MenuDO> menus = getMenuList(reqVO);
// 开启多租户的情况下，需要过滤掉未开通的菜单
tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId())));
return menus;
@ -119,9 +119,13 @@ public class MenuServiceImpl implements MenuService {
* 过滤关闭的菜单节点及其子节点
*
* @param menuList 所有菜单列表
* @return 过滤后的菜单列表
* @return
*/
public List<MenuDO> filterClosedNodes(List<MenuDO> menuList) {
@Override
public List<MenuDO> filterClosedMenus(List<MenuDO> menuList) {
if(CollectionUtils.isEmpty(menuList)){
return Collections.emptyList();
}
// 根据parentId快速查找子节点
Map<Long, List<MenuDO>> childrenMap = menuList.stream()
.collect(Collectors.groupingBy(MenuDO::getParentId));
@ -135,8 +139,7 @@ public class MenuServiceImpl implements MenuService {
markClosedNodes(menu.getId(), childrenMap, closedNodeIds);
}
}
// 过滤掉关闭的节点及其子节点
// 移除掉关闭的节点及其子节点
return menuList.stream()
.filter(menu -> !closedNodeIds.contains(menu.getId()))
.collect(Collectors.toList());
@ -152,12 +155,13 @@ public class MenuServiceImpl implements MenuService {
private void markClosedNodes(Long nodeId, Map<Long,
List<MenuDO>> childrenMap,
Set<Long> closedNodeIds) {
closedNodeIds.add(nodeId);
List<MenuDO> children = childrenMap.get(nodeId);
if (CollectionUtils.isNotEmpty(children)) {
for (MenuDO child : children) {
markClosedNodes(child.getId(), childrenMap, closedNodeIds);
}
// 如果已经标记过，则直接返回
if (!closedNodeIds.add(nodeId)) {
return;
}
List<MenuDO> children = childrenMap.getOrDefault(nodeId,Collections.emptyList());
for (MenuDO child : children) {
markClosedNodes(child.getId(), childrenMap, closedNodeIds);
}
}
@ -185,7 +189,7 @@ public class MenuServiceImpl implements MenuService {
if (CollUtil.isEmpty(ids)) {
return Lists.newArrayList();
}
return filterClosedNodes(menuMapper.selectBatchIds(ids));
return menuMapper.selectBatchIds(ids);
}
/**