From eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 01 Apr 2026 17:20:19 +0800
Subject: [PATCH] opt:兼容人大金仓
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
index 05adbe6..752ffc8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
@@ -26,7 +26,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
<where>
dsm.is_deleted = 0
<if test="param2.name != null and param2.name != ''">
@@ -46,7 +46,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
where dsm.is_deleted = 0
and dsm.id = #{id}
</select>
@@ -72,7 +72,7 @@
and find_in_set(ad.id, ds.area_divide_ids) > 0
) as device_count
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
<where>
dsm.is_deleted = 0
<if test="time != null">
@@ -102,7 +102,7 @@
SELECT
ad.device_ids
FROM ja_fw_defense_scene_manage dsm
- LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id AND ds.is_deleted = 0
+ LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id::VARCHAR AND ds.is_deleted = 0
LEFT JOIN ja_fw_area_divide ad ON FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 AND ad.is_deleted = 0
WHERE dsm.id = #{id}
) ad ON CHAR_LENGTH(ad.device_ids) - CHAR_LENGTH(REPLACE(ad.device_ids, ',', '')) >= numbers.n - 1
@@ -114,7 +114,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
left join ja_fw_area_divide ad on FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 and ad.is_deleted = 0
inner join (
SELECT
--
Gitblit v1.9.3