From 63b484f3fceb54cf545b3c8b722a6f0fceae1689 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 10:54:08 +0800
Subject: [PATCH] sql改造其他模块改造
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
index 261401d..d024733 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -33,11 +33,11 @@
<select id="selectFwEffectEvalPage" resultMap="fwEffectEvalResultMap">
select
ee.*,
- group_concat(distinct ad.area_name separator ',') as area_name,
- group_concat(distinct ds.scene_name separator ',') as scene_name
+ string_agg(distinct ad.area_name, ',') as area_name,
+ string_agg(distinct ds.scene_name, ',') as scene_name
from ja_fw_effect_eval ee
- left join ja_fw_area_divide ad on find_in_set(ee.device_id, ad.device_ids) and ad.is_deleted = 0
- left join ja_fw_defense_scene ds on find_in_set(ad.id, ds.area_divide_ids) and ds.is_deleted = 0
+ left join ja_fw_area_divide ad on ee.device_id = ANY(string_to_array(ad.device_ids, ',')::bigint[]) and ad.is_deleted = 0
+ left join ja_fw_defense_scene ds on ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) and ds.is_deleted = 0
<where>
ee.is_deleted = 0
<if test="param2.deviceName != null and param2.deviceName != ''">
--
Gitblit v1.9.3