Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

 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}