fix

server-module/src/main/java/com/makeit/module/controller/children/tenant/PlatTenantChildrenController.java

@@ -49,8 +49,9 @@ public class PlatTenantChildrenController {
     @ApiOperation("分页列表")
     @PostMapping("page")
     @TenantIdIgnore
+    @AuthIgnore
     public ApiResponseEntity<PageVO<PlatOrg>> page(@RequestBody PageReqDTO<PlatOrgQueryDTO> pageReqDTO){
-        return ApiResponseUtils.success(platOrgService.page(pageReqDTO));
+        return ApiResponseUtils.success(platOrgService.childPage(pageReqDTO));
     }
 
     @ApiOperation("列表")

server-service/src/main/java/com/makeit/service/platform/auth/PlatOrgService.java

@@ -106,4 +106,6 @@ public interface PlatOrgService extends IService<PlatOrg> {
      * @return
      */
     PlatOrgSplitDTO getOrgSplitVO(String orgId);
+
+    PageVO<PlatOrg> childPage(PageReqDTO<PlatOrgQueryDTO> pageReqDTO);
 }

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -27,6 +27,7 @@ import com.makeit.service.platform.auth.PlatRoleService;
 import com.makeit.service.platform.auth.PlatUserRoleService;
 import com.makeit.service.platform.auth.PlatUserService;
 import com.makeit.service.platform.space.PlatSpaceService;
+import com.makeit.service.saas.PlatTenantService;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.user.plat.PlatUserUtil;
@@ -76,6 +77,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
     private PlatAlarmConfigService platAlarmConfigService;
     @Autowired
     private PlatSpaceService platSpaceService;
+    @Autowired
+    private PlatTenantService platTenantService;
 
     @Override
     public List<PlatOrg> filter(List<PlatOrg> deptList, PlatOrgQueryDTO dto) {
@@ -585,6 +588,28 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         return orgTree;
     }
 
+    /**
+     * 返回parentId的 树
+     * @param platOrgQueryDTO
+     * @return
+     */
+    public List<PlatOrg> subOrgList2(PlatOrgQueryDTO platOrgQueryDTO) {
+
+        LambdaQueryWrapper<PlatOrg> queryWrapper = getLambdaQueryWrapper(platOrgQueryDTO);
+        List<PlatOrg> list = list(queryWrapper);
+        if(CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
+        Set<String> filterSet = list.stream().flatMap(vo -> {
+            String path = vo.getPath()+","+vo.getId();
+            String[] split = path.split(",");
+            return Stream.of(split);
+        }).collect(Collectors.toSet());
+        List<PlatOrg> total = list();
+        List<PlatOrg> orgTree = createOrgTree3(total,filterSet, platOrgQueryDTO.getParentId());
+        return orgTree;
+    }
+
     private List<PlatOrg> createOrgTree2(List<PlatOrg> orgList,Set<String> filterSet){
         if(CollectionUtils.isEmpty(orgList)){
             return new ArrayList<>();
@@ -600,6 +625,26 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
     }
 
     /**
+     * 返回父节点
+     * @param orgList
+     * @param filterSet
+     * @return
+     */
+    private List<PlatOrg> createOrgTree3(List<PlatOrg> orgList,Set<String> filterSet,String parentId){
+        if(CollectionUtils.isEmpty(orgList)){
+            return new ArrayList<>();
+        }
+        Map<String, List<PlatOrg>> parentMap = orgList.stream()
+                .filter(vo->filterSet.contains(vo.getId()))
+                .collect(Collectors.groupingBy(PlatOrg::getParentId));
+        orgList.forEach(vo->{
+            vo.setChildren(parentMap.get(vo.getId()));
+        });
+
+        return orgList.stream().filter(vo->StringUtils.equals(vo.getParentId(),parentId)).collect(Collectors.toList());
+    }
+
+    /**
      * 组织表增加一条数据
      * 增加告警配置
      * @param platOrg
@@ -637,4 +682,23 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         }
         return platOrgSplitDTO;
     }
+
+    @Override
+    public PageVO<PlatOrg> childPage(PageReqDTO<PlatOrgQueryDTO> pageReqDTO) {
+        PlatOrgQueryDTO dto = pageReqDTO.getData();
+
+        Page<PlatOrg> p = PageUtil.toMpPage(pageReqDTO);
+        dto.setParentId(TreeConst.TOP_LEVEL);
+        dto.setStatus(CommonEnum.YES.getValue());
+        LambdaQueryWrapper<PlatOrg> queryWrapper = getLambdaQueryWrapper(dto);
+        Page<PlatOrg> pageList = page(p, queryWrapper);
+        List<PlatOrg> records = pageList.getRecords();
+        records.forEach(vo -> {
+            dto.setParentId(vo.getId());
+            List<PlatOrg> subOrgList = subOrgList2(dto);
+            vo.setChildren(subOrgList);
+        });
+
+        return PageUtil.toPageVO(pageList.getRecords(), pageList);
+    }
 }