更新

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

@@ -34,13 +34,25 @@ public class UserController {
         return users;
     }
 
-    @ApiOperation(value = "根据组织id获取用户组", hidden = true)
+    @ApiOperation(value = "根据组织id获取用户组")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long")
     })
-    @GetMapping(value = "/groups")
+    @GetMapping(value = "/userGroups")
     public List<Map> getUserGroups(long orgId) {
         List<Map> userGroups = feignAuthService.getUserGroups(0, orgId);
+        userGroups.forEach(group -> {
+            long groupId = Long.parseLong(group.get("id").toString());
+            List<Map> users = feignAuthService.getGroupUsers(0L, groupId);
+            List<Map> groupSubNodes = new ArrayList<>();
+            users.forEach(user -> {
+                Map node = new HashMap();
+                long userId = Long.parseLong(user.get("id").toString());
+                node.put("node", ImmutableMap.of("id", userId, "name", user.get("name").toString(), "orgId", orgId));
+                groupSubNodes.add(node);
+            });
+            group.put("subNodes", groupSubNodes);
+        });
         return userGroups;
     }
 
@@ -56,16 +68,16 @@ public class UserController {
 
     /**
      * tree structure
-     *
+     * <p>
      * {
-     *     node: {},
-     *     subNodes: [
-     *          {
-     *              node: {},
-     *              subNodes:
-     *              []
-     *          }
-     *     ]
+     * node: {},
+     * subNodes: [
+     * {
+     * node: {},
+     * subNodes:
+     * []
+     * }
+     * ]
      * }
      */
     @ApiOperation(value = "获取补录范围用户树")