From c04afebf9cebfd65bf55c2395e732f36f558d208 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 10:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 3afd1df..09f05c9 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
@@ -38,18 +38,7 @@
<select id="selectFwDevicePage" resultMap="fwDeviceResultMap">
- select
- *,
- (
- select
- count(*)
- from
- ja_fw_device_track tmp
- where
- ja_fw_device.id = tmp.device_id
- ) out_count
- from
- ja_fw_device
+ select * from ja_fw_device
<where>
is_deleted = 0
<if test="param2.id != null and param2.id != ''">
@@ -144,6 +133,12 @@
<if test="status != null">
and status = #{status}
</if>
+ <if test="isTrack != null and isTrack == 1">
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ </if>
+ <if test="isTrack != null and isTrack == 2">
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+ </if>
</where>
</select>
--
Gitblit v1.9.3