From 342b6590ee28cc1a7b501287ce57eec1d6d166b8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
index 19fdea3..7907744 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -81,10 +81,6 @@
<if test="longitude != null ">and c.longitude = #{longitude}</if>
<if test="latitude != null ">and c.latitude = #{latitude}</if>
<if test="altitude != null ">and c.altitude = #{altitude}</if>
- <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
- <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
- WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
- </if>
<if test="camHeading != null ">and c.cam_heading = #{camHeading}</if>
<if test="camPitch != null ">and c.cam_pitch = #{camPitch}</if>
<if test="camRoll != null ">and c.cam_roll = #{camRoll}</if>
--
Gitblit v1.9.3