From 132ce8cd39779ccf0d0c3f791ff47901a9a51180 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Apr 2021 11:46:25 +0800
Subject: [PATCH] 预警数量统计接口修改，解决违禁品未能显示全数据问题，主动报警500错误问题

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 8852614..7770ffa 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -393,7 +393,7 @@
 		//获取类型集合数据
 		String [] type = {"一键求助","违禁品","红色健康码","体温异常"};
 		types = Arrays.asList(type);
-		if (null!=conditionVo){
+		if (null!=conditionVo.getStartTime()){
 			//获取时间集合数据
 			times = DateUtils.getTimeOverOneDate(conditionVo.getStartTime(), conditionVo.getEndTime());
 			//1.统计时间段内一键求助警情数量数据    4-7 修改展示紧急求助

--
Gitblit v1.9.3