From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 19 +++++++++++++++++++
1 files changed, 19 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..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
@@ -53,6 +53,25 @@
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 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">
and (
not exists (
--
Gitblit v1.9.3