From 6bc54b7c414c8e097c6a5638dfe5b66f3c99b6dc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 21 May 2021 16:29:09 +0800
Subject: [PATCH] 海康视频播放
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 6 ++++--
1 files changed, 4 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 becaa6a..7ed85f2 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
@@ -39,6 +39,7 @@
<result column="baname" property="baname"/>
<result column="baid" property="baid"/>
<result column="baphone" property="baphone"/>
+ <result column="manufacturers" property="manufacturers"/>
</resultMap>
<!-- 通用查询映射结果 -->
@@ -214,6 +215,7 @@
e.twoId,
e.threeId,
e.deptId,
+ e.manufacturers,
e.street as place,
e.channelNumber,
u.name as baname,
@@ -609,7 +611,7 @@
WHERE
<if test="alarm.securityArr!=null and alarm.securityArr!=''">
- securityId IS NULL
+ securityId = "" or securityId IS NULL
AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
</if>
@@ -647,7 +649,7 @@
</update>
<update id="updateVaddress">
- update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
+ update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
</update>
<update id="updateAaddress">
--
Gitblit v1.9.3