fix: it 6-1

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptController.java

@@ -128,14 +128,27 @@ public class SysDeptController {
      * @return 返回子级
      */
     @GetMapping(value = "/list/descendant")
-    public R<List<SysDeptRelation>> listDescendants(@RequestParam(value = "deptId", required = false) Integer deptId) {
+    public R<List<SysDept>> listDescendants(@RequestParam(value = "deptId", required = false) Integer deptId) {
 
         if (deptId == null){
             HnqzUser user = SecurityUtils.getUser();
             deptId = user.getDeptId();
         }
 
-        return R.ok(relationService.list(Wrappers.<SysDeptRelation>lambdaQuery().eq(SysDeptRelation::getAncestor, deptId)));
+        List<SysDeptRelation> list = relationService.list(Wrappers.<SysDeptRelation>lambdaQuery().eq(SysDeptRelation::getAncestor, deptId));
+
+        if (CollUtil.isNotEmpty(list)) {
+
+            Set<Integer> collect = list.stream().map(SysDeptRelation::getDescendant).collect(Collectors.toSet());
+
+            List<SysDept> sysDepts = sysDeptService.listByIds(collect);
+
+            return R.ok(sysDepts);
+
+        }
+
+
+        return R.ok(Collections.emptyList());
     }