From 3e10424232d237627a14a455c1ffc709cc091fb5 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 12 Jan 2026 13:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 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 40f3ffc..38c1888 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
@@ -53,6 +53,12 @@
<if test="param2.deviceSpecification != null and param2.deviceSpecification != ''">
and device_specification = #{param2.deviceSpecification}
</if>
+ <if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 1">
+ and effective_range_km is not null
+ </if>
+ <if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 2">
+ and effective_range_km is null
+ </if>
<if test="param2.manufacturer != null and param2.manufacturer != ''">
and manufacturer = #{param2.manufacturer}
</if>
--
Gitblit v1.9.3