From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 4 +++-
1 files changed, 3 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 779463f..9cf89bc 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
@@ -24,6 +24,7 @@
<result column="effective_range_km" property="effectiveRangeKm"/>
<result column="work_mode" property="workMode"/>
<result column="area_code" property="areaCode"/>
+ <result column="device_sn" property="deviceSn"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -55,9 +56,10 @@
</if>
<if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 1">
and effective_range_km is not null
+ and effective_range_km > 0
</if>
<if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 2">
- and effective_range_km is null
+ and (effective_range_km is null or effective_range_km = 0)
</if>
<if test="param2.manufacturer != null and param2.manufacturer != ''">
and manufacturer = #{param2.manufacturer}
--
Gitblit v1.9.3