From b0f656f209539a5ee52e103018e86e7b7692e313 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 18 八月 2023 10:55:20 +0800
Subject: [PATCH] 单兵端--巡检单天计划
---
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 8 ++++----
1 files changed, 4 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..90c8603 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -49,6 +49,7 @@
c.altitude,
c.user_id,
c.dept_id,
+ c.login_id,
c.cam_heading,
c.cam_pitch,
c.cam_roll,
@@ -81,10 +82,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>
@@ -96,6 +93,9 @@
<if test="camMaxVisibleDistance != null ">and c.cam_max_visible_distance = #{camMaxVisibleDistance}</if>
<if test="camAlarmGuideEnable != null ">and c.cam_alarm_guide_enable = #{camAlarmGuideEnable}</if>
<if test="loginId != null ">and c.login_id = #{loginId}</if>
+ <if test="deptId != null ">and (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</where>
--
Gitblit v1.9.3