From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
index a7819dc..02994a6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
@@ -42,7 +42,8 @@
* 鑾峰彇瑙掕壊涓嬬殑鑿滃崟
*/
public List<Menu> listByRoleIds(List<Long> roleIdList) {
- List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
+ List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class)
+ .in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
.stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
if (CollectionUtil.isEmpty(menuIdList)) {
return null;
@@ -56,21 +57,6 @@
BeanUtils.copyProperties(param, menu);
return save(menu);
}
-
-// public Set<Menu> listMenuByRoles(Set<Role> roles) {
-// List<Long> roleIds = roles.stream().map(Role::getId).collect(Collectors.toList());
-// Set<Menu> menus = menuDao.listMenuByRoleIds(roleIds);
-// return menus;
-// }
-//
-// /**
-// * 鎶婅彍鍗曡浆鎴愭爲褰㈢粨鏋�
-// */
-// public List<MenuNode> buildTree(List<Menu> menuList) {
-// return menuList.stream()
-// .filter(menu -> menu.getPid().equals(0L))
-// .map(menu -> covertMenuNode(menu, menuList)).collect(Collectors.toList());
-// }
private MenuNode covertMenuNode(Menu menu, List<Menu> menuList) {
MenuNode node = new MenuNode();
@@ -96,6 +82,7 @@
Menu menu = new Menu();
BeanUtils.copyProperties(param, menu);
+ menu.setType(one.getType());
menu.setId(menuId);
return updateById(menu);
}
--
Gitblit v1.9.3