Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml

@@ -110,6 +110,11 @@
                    </if>
                )
            </if>
            <if test="areaId != null and (filterSelected == null or filterSelected != 1)">
                and ds.area_divide_ids is not null
                and ds.area_divide_ids != ''
                and find_in_set(#{areaId}, replace(ds.area_divide_ids, ' ', ''))
            </if>
        </where>
    </select>