监督检查管理修改

风险点导入修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/ddd/safetyControl/application/service/riskStatistics/impl/RiskStatisticsManageServiceImpl.java

@@ -651,7 +651,7 @@ public class RiskStatisticsManageServiceImpl implements RiskStatisticsManageServ
      * @return
      * @throws IOException
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public BaseResponse<String> importRiskPoint(MultipartFile file) throws IOException {
         BaseResponse<String> baseResponse = new BaseResponse<>();
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/ddd/safetyControl/infrastructure/uitls/RiskTemplate/DownloadRiskTemplateUtil.java

@@ -164,7 +164,7 @@ public class DownloadRiskTemplateUtil {
             }
             String fileDownName = fileList.get(0).getFileDowName();*/
 
-            InputStream in = this.getClass().getClassLoader().getResourceAsStream("excel/fxddrmb.xlsx");;
+            InputStream in = this.getClass().getClassLoader().getResourceAsStream("excel/fxddrmb_old_20250424.xlsx");;
 
             String fileName2 = URLEncoder.encode(fileName, "UTF-8");
             response.setContentType("application/vnd.ms-excel");

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

@@ -89,8 +89,9 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
         if(null != tHazardWorkPlanCheckParam.getOrgIdList() && tHazardWorkPlanCheckParam.getOrgIdList().size()>0){
             tHazardWorkPlanCheckParam.setOrgIdList(orgDao.selectAllSubId(tHazardWorkPlanCheckParam.getOrgIdList()));
             orgIdList.addAll(tHazardWorkPlanCheckParam.getOrgIdList());
+        }else{
+            orgIdList.addAll(orgDao.selectOrgIdAllSubId(ContextUtils.getLoginUser().getOrgId()));
         }
-        orgIdList.addAll(orgDao.selectOrgIdAllSubId(ContextUtils.getLoginUser().getOrgId()));
         tHazardWorkPlanCheckParam.setOrgIdList(orgIdList);
         return this.baseMapper.selectTHazardWorkPlanCheckManageList(page,tHazardWorkPlanCheckParam);
     }