From 12c0569a2943c43e5dd71f35a41f32b59d8c9eea Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 21 Jul 2021 09:00:45 +0800
Subject: [PATCH] 巡逻任务

---
 src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index 78c215c..f3b1774 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -750,29 +750,22 @@
     <!--获取警情数量的集合,全部,未处理,已处理的数量-->
     <select id="getAlarmNumber" resultType="java.lang.Integer">
         (select ifnull(count(*),0) number from sys_alarm
-            where alarmType = '巡逻任务' and
-            (securityId =#{alarm.securityId}
-            or securityId = "" or securityId IS NULL
+            where securityId =#{alarm.securityId}
+            or (securityId = "" or securityId IS NULL)
             and securityArr LIKE concat('%',#{alarm.securityId},'%'))
-            )
 
-        UNION all
+        UNION ALL
         (select ifnull(count(*),0) number from sys_alarm
-            where alarmType = '巡逻任务' and
-            (securityId = "" or securityId IS NULL
+            where securityId = "" or securityId IS NULL
             and securityArr LIKE concat('%',#{alarm.securityId},'%'))
-            )
 
-        UNION all
+        UNION ALL
         (select ifnull(count(*),0) number from sys_alarm
-            where alarmType = '巡逻任务' and
-            securityId =#{alarm.securityId} and jtype = 2)
+            where securityId =#{alarm.securityId} and jtype = 2)
 
-        UNION all
+        UNION ALL
         (select ifnull(count(*),0) number from sys_alarm
-            where
-            alarmType = '巡逻任务' AND
-            securityId =#{alarm.securityId} and jtype = 1)
+            where securityId =#{alarm.securityId} and jtype = 1)
     </select>
 
 

--
Gitblit v1.9.3