From 1799f4a7988d52feb6230b6b140ef6ce1543b0f4 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 11 Sep 2023 14:19:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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