From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +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 | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 8ae640b..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
@@ -64,9 +64,6 @@
}
return menus;
}
-
-
-
/**
* 修改菜单状态
@@ -117,9 +114,9 @@
for (SysMenu sysMenu : allMenus) {
Map<String, Object> authTree = new HashMap<>();
- authTree.put("id", sysMenu.getId());
+ authTree.put("id", sysMenu.getId().toString());
authTree.put("name", sysMenu.getName());
- authTree.put("pId", sysMenu.getParentId());
+ authTree.put("pId", sysMenu.getParentId().toString());
authTree.put("open", true);
authTree.put("checked", false);
if (roleMenusMap.get(sysMenu.getId()) != null) {
@@ -202,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