更新

src/main/java/com/keymobile/rest/controller/UserController.java

@@ -51,6 +51,8 @@ public class UserController {
                 node.put("node", ImmutableMap.of("id", userId, "name", user.get("name").toString(), "orgId", orgId));
                 groupSubNodes.add(node);
             });
+            List<Map> originUsers = feignAuthService.getUsersByOrgId(orgId);
+            group.put("users", originUsers);
             group.put("subNodes", groupSubNodes);
         });
         return userGroups;
@@ -88,7 +90,6 @@ public class UserController {
         List<Map> orgs = (List<Map>) subNodes.get(0).get("subNodes");
         orgs.forEach(org -> {
             long orgId = Long.parseLong(((Map) org.get("node")).get("id").toString());
-            List<Map> originUsers = feignAuthService.getUsersByOrgId(orgId);
             List<Map> groups = feignAuthService.getUserGroups(0L, orgId);
             groups.forEach(group -> {
                 long groupId = Long.parseLong(group.get("id").toString());
@@ -102,7 +103,6 @@ public class UserController {
                 });
                 group.put("subNodes", groupSubNodes);
             });
-            org.put("users", originUsers);
             org.put("subNodes", groups);
         });
         return tree;