From 7ee844962f050cfc548e5dd661a586a4993cbf89 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Thu, 25 Jun 2026 10:28:01 +0800
Subject: [PATCH] 优化问题
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index bec60ee..036be06 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -740,21 +740,24 @@
}
//找排查点，然后查措施
- PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
- if (null != unit){
- //查管控措施
- PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
- if (null != controlMeasureById){
- CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
- CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
+ if (hiddenDanger.getCheckPointId() == null){
+ CJDangerInfo.setRiskMeasureId( null);
+ }else {
+ PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
+ if (null != unit){
+ //查管控措施
+ PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
+ if (null != controlMeasureById){
+ CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
+ CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
+ }else {
+ CJDangerInfo.setRiskMeasureId(null);
+ }
+
}else {
CJDangerInfo.setRiskMeasureId(null);
}
-
- }else {
- CJDangerInfo.setRiskMeasureId(null);
}
-
}else {
CJDangerInfo.setCheckRecordId(null);
CJDangerInfo.setRiskMeasureId(null);
--
Gitblit v1.9.2