From 4dccea657b0258376ea4dc8b796f05f53b7da4d5 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 26 Mar 2021 11:18:20 +0800
Subject: [PATCH] 设备管理修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 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 9e0748a..1aa79ff 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
@@ -42,6 +42,10 @@
         a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
         e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
         e.stype,
+        e.oneId,
+        e.twoId,
+        e.threeId,
+        e.deptId,
         e.channelNumber from sys_alarm a
         LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
         where 1=1
@@ -323,6 +327,7 @@
 	    ) b
 		 on
 		 a.click_date = b.datetime
+		 order by a.click_date asc
     </select>
 
 

--
Gitblit v1.9.3