From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 54c8056..6bcbf16 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
@@ -50,9 +50,18 @@
</select>
<select id="selectFwDefenseSceneList" resultMap="fwDefenseSceneResultMap">
- select ds.* from ja_fw_defense_scene ds
+ select
+ ds.*
+ from
+ ja_fw_defense_scene ds
<where>
- ds.is_deleted = 0
+ ds.is_deleted = 0
+ <if test="deptList != null and deptList.size > 0">
+ and ds.create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
<if test="unbound != null and unbound == 1">
and (
not exists (
--
Gitblit v1.9.3