From dd202fbaa4caea48aa5a0df620b87a6e41dba429 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Mar 2021 16:24:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index 8703914..feb0df0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -107,10 +107,6 @@
 	 */
 	@Override
 	public Integer selectAlarmCount(Integer status) {
-		QueryWrapper<Alarm> wrapper = new QueryWrapper<>();
-		if (status==0){
-			wrapper.eq("alarmTime",new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-		}
-		return baseMapper.selectCount(wrapper);
+		return baseMapper.selectAlarmCount();
 	}
 }

--
Gitblit v1.9.3