From fbe41ac0c9758ade6dc690f5d9e3d5985b5e3f7c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 04 Feb 2026 11:31:40 +0800
Subject: [PATCH] 反无驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
index 938ac2e..6fd5ebf 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -92,10 +92,19 @@
and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and create_dept in
+ and ( create_dept in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <!-- 或者设备是共享给当前部门的 -->
+ <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
+ or 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