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/FwAreaDivideMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index c7e49ec..bca71ed 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -101,7 +101,13 @@
from ja_fw_area_divide ad
left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
<where>
- ad.is_deleted = 0
+ ad.is_deleted = 0
+ <if test="deptList != null and deptList.size > 0">
+ and ad.create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
<if test="isSetSceneManage != null and isSetSceneManage == 1">
and exists (
select 1
@@ -300,7 +306,7 @@
from ja_fw_effect_eval ee
join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
where ee.is_deleted = 0
- and ee.counter_effect = 'success'
+ and ee.counter_effect = '1'
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
end as counter_success_count
@@ -487,6 +493,16 @@
) dd on find_in_set(dd.id, ad.device_ids)
</select>
+ <select id="checkAreaBindScene" resultType="java.lang.Boolean">
+ select
+ count(1)
+ from ja_fw_defense_scene_manage dsm
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ where ds.is_deleted = 0
+ and find_in_set(#{areaId}, ds.area_divide_ids)
+ and dsm.is_deleted = 0
+ </select>
+
<insert id="insertWithGeom" parameterType="org.sxkj.fw.area.entity.FwAreaDivideEntity" useGeneratedKeys="true" keyProperty="id">
insert into ja_fw_area_divide (
id,
--
Gitblit v1.9.3