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/orderdata/mapper/GdDataObjectionMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
index c77890f..8a03f02 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
@@ -37,9 +37,9 @@
ja_gd_data_objection do
left join
ja_gd_data_objection_attachment da
- on do.id = da.objection_id and da.is_deleted = 0
+ on do.id = da.objection_id::VARCHAR and da.is_deleted = 0
left join
- blade_dept bd on bd.id = do.create_dept
+ blade_dept bd on bd.id = do.create_dept::VARCHAR
<where>
do.is_deleted = 0
and da.is_deleted = 0
@@ -50,7 +50,13 @@
and do.objection_status = #{param2.objectionStatus}
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and do.create_dept in
+ and (
+ do.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ )
+ or do.apply_target_dept_id in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
@@ -72,7 +78,7 @@
from
ja_gd_data_objection do
left join
- ja_gd_data_objection_attachment da on do.id = da.objection_id
+ ja_gd_data_objection_attachment da on do.id = da.objection_id::VARCHAR
<where>
and da.is_deleted = 0
<if test="id != null ">
--
Gitblit v1.9.3