From 7d22021bf70d7c9a940928e0b437579844f6ae94 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 21 八月 2023 16:08:30 +0800
Subject: [PATCH] 临时提交

---
 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
index 2c6c26a..96eab59 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -338,11 +338,6 @@
 
 
 
-
-
-
-
-
     /**
      * 修改隐患上报
      */
@@ -352,11 +347,13 @@
         // todo-2022 修改前查询
         PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hdcp.getId());
 
-        hdcp.setHazardCode(dangerInfo.getHazardCode());
-        hdcp.setDangerSrc(dangerInfo.getDangerSrc());
-        hdcp.setDangerReason(dangerInfo.getDangerReason());
-        hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
-        hdcp.setDangerResult(dangerInfo.getDangerResult());
+        if (ObjectUtils.isNotEmpty(dangerInfo)){
+            hdcp.setHazardCode(dangerInfo.getHazardCode());
+            hdcp.setDangerSrc(dangerInfo.getDangerSrc());
+            hdcp.setDangerReason(dangerInfo.getDangerReason());
+            hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
+            hdcp.setDangerResult(dangerInfo.getDangerResult());
+        }
 
         mmap.put("hiddenDangerCheckPoint", hdcp);
 

--
Gitblit v1.9.2