From faa6130891b7ab6e9fe14a5afb33e003b2a19b1f Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 13 六月 2024 08:59:11 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
index a9ac804..4c41411 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
@@ -46,7 +46,7 @@
}
/**
- * 查询隐患排查列表头 todo
+ * 查询隐患排查列表头
*/
@PostMapping("/list")
@ResponseBody
@@ -128,8 +128,10 @@
//隐患排查实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(hiddenDangerCheckPoint.getId());
- if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){
- hiddenDangerCheckPoint.setReportTime(dangerInfo.getReportTime());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){
+ hiddenDangerCheckPoint.setReportTime(dangerInfo.getReportTime());
+ }
}
mmap.put("hdcp", hiddenDangerCheckPoint);
return prefix + "/detailDangerAccept";
--
Gitblit v1.9.2