From e0d1a9a05fee8ef75ce8f5bd7107be32ec8c8e82 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 20 Mar 2021 08:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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 7db4617..4e0cd8b 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
@@ -75,7 +75,7 @@
             and a.alarmTime&lt;=#{alarm.endTime}
         </if>
 
-        and a.waringType NOT IN("系统测试","主机重新上电")
+        and a.waringType IN("紧急求救")
 
         ORDER BY
         a.jtype ASC,
@@ -277,10 +277,10 @@
 
 
     <update id="updateJtype">
-        update sys_alarm SET jtype=#{jtype},bz=#{bz} where id=#{id}
+        update sys_alarm SET jtype=#{jtype},bz=#{bz},jjTime=#{jjtime} where id=#{id}
     </update>
 
-    <update id="updatePoliceStatus">selectAlarmPage
+    <update id="updatePoliceStatus">
         update jfpth.blade_user SET work_status=#{status} where id=#{id}
     </update>
 

--
Gitblit v1.9.3