From 853ef07e2d6ce1eaa000927d8bfd9ff93ffb8b06 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 15 Jul 2021 14:15:50 +0800
Subject: [PATCH] 警情任务分类显示问题修复
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 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 0867835..6d5ad03 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -648,7 +648,7 @@
<sql id="getAlarmListSqlParam">
select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
a.deviceNumber,a.region,e.district,a.vaddress,a.aaddress,
- a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
+ a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
a.securityArr,a.securityId,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
e.stype,
@@ -731,16 +731,16 @@
or securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
- union
+ UNION ALL
(select ifnull(count(*),0) number from sys_alarm
where securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
- union
+ UNION ALL
(select ifnull(count(*),0) number from sys_alarm
where securityId =#{alarm.securityId} and jtype = 2)
- union
+ UNION ALL
(select ifnull(count(*),0) number from sys_alarm
where securityId =#{alarm.securityId} and jtype = 1)
</select>
--
Gitblit v1.9.3