From fc223b26f87f7a221b38084bb62d8047974bbf1c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 12:42:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
index 600bd93..4c97f5a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
@@ -41,7 +41,7 @@
@Autowired
private ISysMenuService menuService;
- /**
+ /**current
* 两层循环实现建树
*
* @param sysMenus
@@ -199,7 +199,8 @@
if (CollectionUtil.isEmpty(roles)) {
return ResultBody.ok().data(Collections.emptyList());
}
- List<SysMenu> menus = menuService.findByRoleCodes(roles.parallelStream().map(SysRole::getCode).collect(Collectors.toSet()), CommonConstant.MENU);
+ Set<String> collect = roles.stream().map(e -> e.getCode()).collect(Collectors.toSet());
+ List<SysMenu> menus = menuService.findByRoleCodes(collect, CommonConstant.MENU);
return ResultBody.ok().data(treeBuilder(menus));
}
}
--
Gitblit v1.8.0