From ba0fbe5e47b484d3c2cc89b8d28f78c7ecf9b44c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 11:16:18 +0800
Subject: [PATCH] 场景，区域的列表新增父子级id查询
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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..762bb35 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
@@ -87,16 +87,23 @@
select ds.* from ja_fw_defense_scene ds
<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)
- )
- </if>
+ <choose>
+ <when test="areaId != null">
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and find_in_set(#{areaId}, replace(ds.area_divide_ids, ' ', ''))
+ </when>
+ <when 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)
+ )
+ </when>
+ </choose>
</where>
</select>
--
Gitblit v1.9.3