监督检查合规率统计修改

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

@@ -161,7 +161,22 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
         String finalOrgId = orgId;
         List<String> orgIds = new ArrayList<>();
         if (tHazardWorkPlanCheckParam.getOrgIdList() != null && tHazardWorkPlanCheckParam.getOrgIdList().size() > 0) {
-            orgIds = tHazardWorkPlanCheckParam.getOrgIdList();
+            //orgIds = tHazardWorkPlanCheckParam.getOrgIdList();
+            //如果只查当前机构数据
+            if (tHazardWorkPlanCheckParam.isThisOrg()) {
+                orgIds = tHazardWorkPlanCheckParam.getOrgIdList();
+            } else {
+                List<String> orgIdList = tHazardWorkPlanCheckParam.getOrgIdList();
+                for(String id : orgIdList){
+                    List<String> ids = sysOrgService.list(new QueryWrapper<SysOrg>().eq(SysOrg.PARENT_ID, id).ne(SysOrg.STATUS, BizConstants.STATUS_DELETE).eq(SysOrg.IS_DEPT, 0).orderByAsc("tree_sort")).stream().map(SysOrg::getOrgId).collect(Collectors.toList());
+                    //如果下级机构为空
+                    if (ids == null || ids.size() == 0) {
+                        //存入当前机构
+                        ids.add(finalOrgId);
+                    }
+                    orgIds.addAll(ids);
+                }
+            }
         }else {
             //如果只查当前机构数据
             if (tHazardWorkPlanCheckParam.isThisOrg()) {