From f0ad850a7a962dcf53c6c88e31de4bc2b1e20457 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 15:18:16 +0800
Subject: [PATCH] 设备和区域场景list 过滤时增加id返回已绑定的子数据
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index d561a38..a56b376 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -156,29 +156,29 @@
left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
<where>
ad.is_deleted = 0
- <choose>
- <when test="sceneId != null">
- and exists (
+ <if test="filterSelected != null and filterSelected == 1">
+ and (
+ not exists (
select 1
from ja_fw_defense_scene ds
where ds.is_deleted = 0
- and ds.id = #{sceneId}
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
)
- </when>
- <when test="filterSelected != null and filterSelected == 1">
- and not exists (
- select 1
- from ja_fw_defense_scene ds
- where ds.is_deleted = 0
- and ds.area_divide_ids is not null
- and ds.area_divide_ids != ''
- and find_in_set(ad.id, ds.area_divide_ids)
- )
- </when>
- </choose>
+ <if test="sceneId != null">
+ or exists (
+ select 1
+ from ja_fw_defense_scene ds
+ where ds.is_deleted = 0
+ and ds.id = #{sceneId}
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ )
+ </if>
+ )
+ </if>
</where>
</select>
--
Gitblit v1.9.3