Commit 692d4a5a by chenweisong

更新

parent ca55bfb0
...@@ -88,6 +88,7 @@ public class UserController { ...@@ -88,6 +88,7 @@ public class UserController {
List<Map> orgs = (List<Map>) subNodes.get(0).get("subNodes"); List<Map> orgs = (List<Map>) subNodes.get(0).get("subNodes");
orgs.forEach(org -> { orgs.forEach(org -> {
long orgId = Long.parseLong(((Map) org.get("node")).get("id").toString()); long orgId = Long.parseLong(((Map) org.get("node")).get("id").toString());
List<Map> originUsers = feignAuthService.getUsersByOrgId(orgId);
List<Map> groups = feignAuthService.getUserGroups(0L, orgId); List<Map> groups = feignAuthService.getUserGroups(0L, orgId);
groups.forEach(group -> { groups.forEach(group -> {
long groupId = Long.parseLong(group.get("id").toString()); long groupId = Long.parseLong(group.get("id").toString());
...@@ -101,6 +102,7 @@ public class UserController { ...@@ -101,6 +102,7 @@ public class UserController {
}); });
group.put("subNodes", groupSubNodes); group.put("subNodes", groupSubNodes);
}); });
org.put("users", originUsers);
org.put("subNodes", groups); org.put("subNodes", groups);
}); });
return tree; return tree;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment