From 4006777cc118ac160fce81f6781b33a6b6307a3b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 4fafbf3..4c35486 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
@@ -53,6 +53,14 @@
         select ds.* from ja_fw_defense_scene ds
         <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
+                )
+            </if>
             <if test="filterSelected != null and filterSelected == 1">
                 and (
                     not exists (

--
Gitblit v1.9.3