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-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
index 49c057e..4a0bbfd 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
@@ -153,7 +153,7 @@
<!--自定义详情查询-根据系统配置id-->
<select id="getDetailBySysConfigId" resultType="org.sxkj.system.vo.DeptVO">
select bd.* from blade_dept bd
- left join sys_config sc on sc.dept_id = bd.id and sc.is_deleted = 0
+ left join sys_config sc on sc.dept_id = bd.id::VARCHAR and sc.is_deleted = 0
where bd.is_deleted = 0
and sc.id = #{dept.sysConfigId}
</select>
@@ -163,7 +163,7 @@
select
bd.*,sc.id as sysConfigId,sc.name as sysName
from blade_dept bd
- left join sys_config sc on sc.dept_id = bd.id and sc.is_deleted = 0
+ left join sys_config sc on sc.dept_id = bd.id::VARCHAR and sc.is_deleted = 0
where bd.is_deleted = 0
and (
bd.id = #{deptId}
@@ -176,7 +176,7 @@
select
bd.*,sc.name as sysName
from blade_dept bd
- left join sys_config sc on sc.dept_id = bd.id and sc.is_deleted = 0
+ left join sys_config sc on sc.dept_id = bd.id::VARCHAR and sc.is_deleted = 0
where bd.is_deleted = 0
and (
bd.id = #{deptId}
@@ -195,7 +195,7 @@
bd.sort
FROM
blade_dept bd
- left join manage_device_per_share ddps on ddps.loan_to_dept_id = bd.id
+ left join manage_device_per_share ddps on ddps.loan_to_dept_id = bd.id::VARCHAR
where bd.is_deleted = 0
and bd.id != #{deptId}
and ifnull(device_sn,'') != #{deviceSn}
@@ -247,8 +247,8 @@
SELECT
CONCAT(p.name, ' ', c.name, ' ', r.name) AS full_region_name
FROM blade_region r
- LEFT JOIN blade_region c ON r.parent_code = c.code <!-- 市级 -->
- LEFT JOIN blade_region p ON c.parent_code = p.code <!-- 省级 -->
+ LEFT JOIN blade_region c ON r.parent_code = c.code::VARCHAR <!-- 市级 -->
+ LEFT JOIN blade_region p ON c.parent_code = p.code::VARCHAR <!-- 省级 -->
WHERE r.code = #{areaCode}
</select>
<select id="getSingleRegionName" resultType="string">
@@ -263,7 +263,7 @@
<!-- 市级：后 8 位为 0，且不是省级 -->
SELECT CONCAT(p.name, ' ', c.name) AS full_region_name
FROM blade_region c
- LEFT JOIN blade_region p ON c.parent_code = p.code
+ LEFT JOIN blade_region p ON c.parent_code = p.code::VARCHAR
WHERE SUBSTRING(#{areaCode}, 5, 8) = '00000000'
AND SUBSTRING(#{areaCode}, 3, 10) != '0000000000'
AND c.code = #{areaCode}
@@ -273,8 +273,8 @@
<!-- 县级：后 8 位不全为 0 -->
SELECT CONCAT(p.name, ' ', c.name, ' ', r.name) AS full_region_name
FROM blade_region r
- LEFT JOIN blade_region c ON r.parent_code = c.code
- LEFT JOIN blade_region p ON c.parent_code = p.code
+ LEFT JOIN blade_region c ON r.parent_code = c.code::VARCHAR
+ LEFT JOIN blade_region p ON c.parent_code = p.code::VARCHAR
WHERE SUBSTRING(#{areaCode}, 5, 8) != '00000000'
AND r.code = #{areaCode}
</select>
@@ -284,7 +284,7 @@
bd.*,
br.name AS area_name
FROM
- blade_dept bd LEFT JOIN blade_region br ON br.code = bd.area_code
+ blade_dept bd LEFT JOIN blade_region br ON br.code = bd.area_code::VARCHAR
WHERE
bd.is_deleted = 0
<if test="param2.deptName!=null and param2.deptName!=''">
@@ -306,7 +306,7 @@
FROM
blade_dept bd
LEFT JOIN
- blade_region br ON br.code = bd.area_code
+ blade_region br ON br.code = bd.area_code::VARCHAR
WHERE
bd.is_deleted = 0
<if test="deptName!=null and deptName!=''">
@@ -334,7 +334,7 @@
FROM
blade_dept bd
LEFT JOIN
- blade_region br ON br.code = bd.area_code
+ blade_region br ON br.code = bd.area_code::VARCHAR
WHERE
bd.is_deleted = 0
<if test="dept.id!=null">
--
Gitblit v1.9.3