监督检查合规率统计修改

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

@@ -85,9 +85,13 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
     @Override
     public Page<THazardWorkPlanCheck> selectTHazardWorkPlanCheckManageList(THazardWorkPlanCheckParam tHazardWorkPlanCheckParam) {
         IPage<THazardWorkPlanCheck> page = new Page<>(Long.valueOf(tHazardWorkPlanCheckParam.getPage()), Long.valueOf(tHazardWorkPlanCheckParam.getLimit()));
+        List<String> orgIdList = new ArrayList<>();
         if(null != tHazardWorkPlanCheckParam.getOrgIdList() && tHazardWorkPlanCheckParam.getOrgIdList().size()>0){
             tHazardWorkPlanCheckParam.setOrgIdList(orgDao.selectAllSubId(tHazardWorkPlanCheckParam.getOrgIdList()));
+            orgIdList.addAll(tHazardWorkPlanCheckParam.getOrgIdList());
         }
+        orgIdList.addAll(orgDao.selectOrgIdAllSubId(ContextUtils.getLoginUser().getOrgId()));
+        tHazardWorkPlanCheckParam.setOrgIdList(orgIdList);
         return this.baseMapper.selectTHazardWorkPlanCheckManageList(page,tHazardWorkPlanCheckParam);
     }
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/notice/dao/TSysOrgDao.java

@@ -23,4 +23,6 @@ public interface TSysOrgDao extends SuperDao<TSysOrg> {
 
     List<String> selectAllSubId(@Param("orgIds") List<String> orgIds);
 
+    List<String> selectOrgIdAllSubId(@Param("orgId") String orgId);
+
 }

zlmy-modules/zlmy-boot/src/main/resources/mapper/demo/notice/dao/TSysOrgDao.xml

@@ -37,4 +37,15 @@
         </foreach>
     </select>
 
+    <select id="selectOrgIdAllSubId" resultType="string">
+        SELECT org_id FROM t_sys_org
+        WHERE status = '0' and is_dept = '0'
+        START WITH parent_id =#{orgId}
+        CONNECT BY PRIOR org_id = parent_id
+
+        union all
+        SELECT org_id FROM t_sys_org
+        WHERE status = '0' and is_dept = '0' and org_id=#{orgId}
+    </select>
+
 </mapper>
\ No newline at end of file