From 537ec77cf3336de7c2cf66a145490c8d3e1016a6 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Wed, 28 Sep 2022 18:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=A1=AE=E8=AE=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index 447f577..4e8ad77 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/api/app/lib/controllers/alarm/data.js
@@ -172,8 +172,8 @@ async function list (ctx) {
             // } else {
             //    corConfirmedData = {}
             // }
-            ar.confirmedContent = corConfirmedData.Content
-            ar.confirmedTime = corConfirmedData.Time
+            ar.confirmedContent = corConfirmedData.Content || null
+            ar.confirmedTime = corConfirmedData.Time || null
 
             // 告警详情的数量
             ar.detailCount = (alarmDetailCount.find(adc => adc.AlarmId == ar.AlarmId) || { count: 0 }).count