危险作业单位查询包含下级

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -1876,11 +1876,17 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
             //查询下级机构id
             queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);*/
 
+
             List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
                     .filter(s -> !s.trim().isEmpty()) // 忽略空值
                     .collect(Collectors.toList());
+            List<String> idsChildrenById = new  ArrayList<>();
+            for(String orgId:list){
+                idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
+            }
+            idsChildrenById.addAll(list);
             //查询下级机构id
-            queryWrapper.in(THazardWorkPlan.ORG_ID, list);
+            queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);
         }
         if (StringHelper.isNotEmpty(queryParam.getStatus())) {
             queryWrapper.eq(THazardWorkPlan.STATUS, queryParam.getStatus());