From 0bd3d045a891f8cdcef45d9da850f88d222f38b8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 11:33:27 +0800
Subject: [PATCH] opt: sql改造其他模块改造5
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 02a5137..38736bf 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
@@ -112,7 +112,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -123,7 +123,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -264,14 +264,14 @@
(
select string_agg(distinct ds.scene_name)
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[])
) as scene_name,
(
select string_agg(distinct ds.scene_type, ',')
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[])
) as scene_type,
@@ -316,7 +316,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[])
)
@@ -497,7 +497,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -508,7 +508,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
--
Gitblit v1.9.3