From 1f3902d6ecd37fea086ffcf1a1bf4d4ed112b45e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 05 Jun 2021 16:32:27 +0800
Subject: [PATCH] 公安版本初版

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

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 7d4d0fe..a5531c6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -217,7 +217,7 @@
         e.threeId,
         e.deptId,
         e.manufacturers,
-        e.street as place,
+        a.place as place,
         e.channelNumber,
         u.name as baname,
         u.id as baid,
@@ -228,7 +228,6 @@
         LEFT JOIN jfpthPublicSecurity.blade_user u ON u.id = a.securityId
         where 1=1
         <include refid="alarmCondition"></include>
-        and a.waringType IN("紧急求救")
         ORDER BY
         a.jtype ASC,
         a.alarmTime DESC

--
Gitblit v1.9.3