From 7101588d0765780ce18aff3a380c8f3f29efc472 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Apr 2026 20:18:46 +0800
Subject: [PATCH] opt:优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 17b7504..8280ec6 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,16 +65,16 @@
from
ja_fw_task_schedule ts
left join
- ja_fw_device d on d.id = ts.device_id::VARCHAR
+ ja_fw_device d on d.id::VARCHAR = ts.device_id::VARCHAR
left join
- ja_fw_area_divide ad on ad.id = ts.area_divide_id::VARCHAR
+ ja_fw_area_divide ad on ad.id::VARCHAR = ts.area_divide_id::VARCHAR
left join
- ja_fw_defense_scene_manage dsm on dsm.id = ts.defense_scene_id::VARCHAR
+ ja_fw_defense_scene_manage dsm on dsm.id::VARCHAR = ts.defense_scene_id::VARCHAR
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(dsm.id, replace(dz.defense_scene_ids, ' ', ''))
+ and dsm.id::VARCHAR = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ','))
<where>
ts.is_deleted = 0
<if test="param2.deviceName != null and param2.deviceName != ''">
@@ -87,7 +87,7 @@
and d.device_type = #{param2.deviceType}
</if>
<if test="param2.status != null and param2.status != ''">
- and d.status = #{param2.status}
+ and d.status::text = #{param2.status}::text
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
and ts.create_dept in
--
Gitblit v1.9.3