From c04afebf9cebfd65bf55c2395e732f36f558d208 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 10:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index 0e330fb..fb52b1c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -65,9 +65,9 @@
ad.area_name,
dz.zone_name as defense_zone_name
from ja_fw_task_schedule ts
- left join ja_fw_device d on d.id = ts.device_id and d.is_deleted = 0
- left join ja_fw_area_divide ad on ad.id = ts.area_divide_id and ad.is_deleted = 0
- left join ja_fw_defense_scene ds on ds.id = ts.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_device d on d.id = ts.device_id
+ left join ja_fw_area_divide ad on ad.id = ts.area_divide_id
+ left join ja_fw_defense_scene ds on ds.id = ts.defense_scene_id
left join ja_fw_defense_zone dz on dz.is_deleted = 0
and dz.defense_scene_ids is not null
and dz.defense_scene_ids != ''
--
Gitblit v1.9.3