From 323920263d32d41588bd2f9ab45f67afb3c8471b Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Mon, 17 Jun 2019 17:21:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1-=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/dashboard/ConfigStatisticsController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
index 2b5bd6aa9..c88f3f0c4 100644
--- a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
@@ -70,7 +70,7 @@ public class ConfigStatisticsController extends BaseController {
 		        String now =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
 		        cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
 		        String oneHoursAgo =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
-		        if(concent ==null || concent.equals("1")){
+		        if(concent !=null && concent.equals("1")){
 		        	ConfigStatistic entity=new ConfigStatistic();
 		        	entity.setBeginDate(oneHoursAgo);
 		        	entity.setEndDate(now);