From ebe1440caecb571988c6b97564b770960adf910e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 18 Jan 2022 09:07:30 +0800
Subject: [PATCH] 1敏感词限制

---
 src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 005131b..dd58302 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -717,12 +717,12 @@
         AND securityArr LIKE concat('%',#{alarm.securityId},'%')
         order by alarmTime desc limit 9999
         )a)
-        union
+        union all
         (select * from (
         <include refid="getAlarmListSqlParam"/>
         and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
         )a)
-        union
+        union all
         (select * from (
         <include refid="getAlarmListSqlParam"/>
         and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999

--
Gitblit v1.9.3