From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.xml
index 6f3c237..7b7c0e4 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.xml
@@ -11,7 +11,6 @@
<result column="purpose" property="purpose"/>
<result column="charger" property="charger"/>
<result column="contact_phone" property="contactPhone"/>
- <result column="dept_name" property="deptName"/>
<result column="area_code" property="areaCode"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -24,7 +23,16 @@
<select id="selectFwDeviceTrackPage" resultMap="fwDeviceTrackResultMap">
- select * from ja_fw_device_track where is_deleted = 0
+ select * from ja_fw_device_track
+ <where>
+ is_deleted = 0
+ <if test="param2.id != null and param2.id != ''">
+ and id = #{param2.id}
+ </if>
+ <if test="param2.deviceId != null and param2.deviceId != ''">
+ and device_id = #{param2.deviceId}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3