From 7e28149acdcf0c7dd59171c0ec63807759c86c00 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 05 九月 2023 10:41:35 +0800
Subject: [PATCH] 电子围栏报警区分禁入禁出 电子围栏报警查看标记增加毫秒 初始化程序增加启动顺序
---
ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
index da756a4..813c2d8 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml
@@ -42,8 +42,10 @@
<if test="wallPoi != null and wallPoi != ''"> and wall_poi = #{wallPoi}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="color != null and color != ''"> and color = #{color}</if>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ <if test="deptId != null ">and (dept_id = #{deptId} OR dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
</where>
</select>
--
Gitblit v1.9.3