From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 da1920d..bfe7059 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
@@ -107,6 +107,8 @@
)
</if>
</where>
+ order by
+ create_time desc
</select>
<select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
@@ -342,13 +344,13 @@
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
- <!-- <if test="currentDeptId != null and currentDeptId != '' "> -->
- <!-- or a.id in ( -->
- <!-- SELECT device_id FROM ja_fw_device_per_share -->
- <!-- WHERE loan_to_dept_id = #{currentDeptId} -->
- <!-- AND is_deleted = 0 -->
- <!-- ) -->
- <!-- </if> -->
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or a.id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
)
</if>
group by a.device_type,b.dict_value
@@ -396,10 +398,18 @@
WHERE
is_deleted = 0
<if test="deptList != null and deptList.size > 0">
- and create_dept in
+ and ( create_dept in
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
</if>
GROUP BY
manufacturer
--
Gitblit v1.9.3