From 7352414ad37db83a68772e94cdc69e0be131a93b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 21 May 2021 16:23:22 +0800
Subject: [PATCH] 海康视频播放
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 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 ef8ce01..12c71d9 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
@@ -214,6 +214,7 @@
e.twoId,
e.threeId,
e.deptId,
+ e.manufacturers,
e.street as place,
e.channelNumber,
u.name as baname,
@@ -609,7 +610,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>
--
Gitblit v1.9.3