From dbc7e62be76ff48b26461ffaef9c3fc87be018cb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 11 Feb 2026 11:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
index 5ebbd1b..05adbe6 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
@@ -125,12 +125,12 @@
d.is_deleted = 0
AND d.is_enabled = 1
AND d.final_outbound_area IS NOT NULL
- <if test="regionCode != null and regionCode != ''">
- and ( d.final_outbound_area_code like concat(#{regionCode},'%')
- <if test="currentDeptId != null and currentDeptId != '' ">
+ <if test="fwBaseInfo.regionCode != null and fwBaseInfo.regionCode != ''">
+ and ( d.final_outbound_area_code like concat(#{fwBaseInfo.regionCode},'%')
+ <if test="fwBaseInfo.currentDeptId != null and fwBaseInfo.currentDeptId != '' ">
or d.id in (
SELECT device_id FROM ja_fw_device_per_share
- WHERE loan_to_dept_id = #{currentDeptId}
+ WHERE loan_to_dept_id = #{fwBaseInfo.currentDeptId}
AND is_deleted = 0
)
</if>
@@ -141,6 +141,10 @@
) dd on find_in_set(dd.id, ad.device_ids)
<where>
dsm.is_deleted = 0
+ <if test="time != null">
+ and (dsm.effective_date_start is null or dsm.effective_date_start <= #{time})
+ and (dsm.effective_date_end is null or dsm.effective_date_end >= #{time})
+ </if>
</where>
</select>
--
Gitblit v1.9.3