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-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
index ac5e1c0..2a6d831 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -89,8 +89,8 @@
ifnull(bu.real_name, bu.name) as dispose_user_name,
bd.dept_name as dispose_dept_name
from (select * from ja_gd_clue_event ${ew.customSqlSegment}) ce
- left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
+ left join blade_user bu on bu.id = ce.dispose_user::VARCHAR and bu.is_deleted = 0
+ left join blade_dept bd on bd.id = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
</select>
<select id="selectGdClueEventSimpleList" resultMap="gdClueEventListVoResultMap">
@@ -98,7 +98,7 @@
tr.result_url as event_image_url,
ce.create_time as create_time
from ja_gd_clue_event ce
- left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id = ce.result_id::VARCHAR and tr.is_deleted = 0
<include refid="gdClueEventDeptWhere"/>
and ce.event_status in (1, 3)
<if test="keyword != null and keyword != ''">
@@ -121,11 +121,11 @@
tr.shoot_time as shoot_time,
tr.result_url as event_image_url
from ja_gd_clue_event ce
- left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
- left join blade_user cu on cu.id = ce.create_user and cu.is_deleted = 0
- left join blade_dept cd on cd.id = ce.create_dept and cd.is_deleted = 0
- left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
+ left join blade_user bu on bu.id = ce.dispose_user::VARCHAR and bu.is_deleted = 0
+ left join blade_dept bd on bd.id = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
+ left join blade_user cu on cu.id = ce.create_user::VARCHAR and cu.is_deleted = 0
+ left join blade_dept cd on cd.id = ce.create_dept::VARCHAR and cd.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id = ce.result_id::VARCHAR and tr.is_deleted = 0
<include refid="gdClueEventDeptWhere"/>
and ce.id = #{id}
</select>
--
Gitblit v1.9.3