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/area/mapper/FwDefenseSceneMapper.xml | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
index a8260fd..b2c4e36 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -88,15 +88,33 @@
<where>
ds.is_deleted = 0
<if test="filterSelected != null and filterSelected == 1">
- and not exists (
- select 1
- from ja_fw_defense_zone dz
- where dz.is_deleted = 0
- and dz.defense_scene_ids is not null
- and dz.defense_scene_ids != ''
- and find_in_set(ds.id, dz.defense_scene_ids)
+ and (
+ not exists (
+ select 1
+ from ja_fw_defense_zone dz
+ where dz.is_deleted = 0
+ and dz.defense_scene_ids is not null
+ and dz.defense_scene_ids != ''
+ and find_in_set(ds.id, dz.defense_scene_ids)
+ )
+ <if test="zoneId != null">
+ or exists (
+ select 1
+ from ja_fw_defense_zone dz
+ where dz.is_deleted = 0
+ and dz.id = #{zoneId}
+ and dz.defense_scene_ids is not null
+ and dz.defense_scene_ids != ''
+ and find_in_set(ds.id, dz.defense_scene_ids)
+ )
+ </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>
--
Gitblit v1.9.3