From 4db2325a48fa099337835cec2ebb49e817275a7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 19:55:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 4c35486..54c8056 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
@@ -54,11 +54,22 @@
<where>
ds.is_deleted = 0
<if test="unbound != null and unbound == 1">
- and not exists (
- select 1
- from ja_fw_defense_scene_manage dsm
- where dsm.is_deleted = 0
- and dsm.defense_scene_id = ds.id
+ and (
+ not exists (
+ select 1
+ from ja_fw_defense_scene_manage dsm
+ where dsm.is_deleted = 0
+ and dsm.defense_scene_id = ds.id
+ )
+ <if test="sceneManageId != null">
+ or exists (
+ select 1
+ from ja_fw_defense_scene_manage dsm
+ where dsm.is_deleted = 0
+ and dsm.id = #{sceneManageId}
+ and dsm.defense_scene_id = ds.id
+ )
+ </if>
)
</if>
<if test="filterSelected != null and filterSelected == 1">
--
Gitblit v1.9.3