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/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 cceae1d..3fbdf15 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
@@ -40,7 +40,7 @@
ts.device_id,
ts.area_divide_id,
ts.defense_scene_id,
- ds.scene_name as defense_scene_name,
+ dsm.scene_name as defense_scene_name,
ts.longitude,
ts.latitude,
ts.dispatch_user,
@@ -69,12 +69,12 @@
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
+ ja_fw_defense_scene_manage dsm on dsm.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 != ''
- and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
+ and find_in_set(dsm.id, replace(dz.defense_scene_ids, ' ', ''))
<where>
ts.is_deleted = 0
<if test="param2.deviceName != null and param2.deviceName != ''">
--
Gitblit v1.9.3