From e7ff4f706d31473cfa8cadd2415204e932894e73 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 29 Jan 2026 13:05:30 +0800
Subject: [PATCH] 设备共享
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
index bd5ba5c..972538a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -23,7 +23,10 @@
<select id="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap">
- select dfr.* from ja_fw_drone_flight_record dfr
+ select
+ dfr.*
+ from
+ ja_fw_drone_flight_record dfr
<where>
dfr.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
@@ -57,10 +60,19 @@
and dfr.area_name like CONCAT('%', #{param2.areaName}, '%')
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and dfr.create_dept in
+ and (dfr.create_dept in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <!-- 或者设备是共享给当前部门的 -->
+ <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
+ or dfr.device_id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{param2.currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
</if>
</where>
</select>
--
Gitblit v1.9.3