From bbda1baa0df3c13c686c6c710017f503af1267e5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 14:31:29 +0800
Subject: [PATCH] opt: sql改造其他模块改造9
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 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 4a0bbfd..2651c5d 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
@@ -176,10 +176,12 @@
select
bd.*,sc.name as sysName
from blade_dept bd
- left join sys_config sc on sc.dept_id = bd.id::VARCHAR and sc.is_deleted = 0
+ left join sys_config sc
+ on sc.dept_id::VARCHAR = bd.id::VARCHAR
+ and sc.is_deleted = 0
where bd.is_deleted = 0
and (
- bd.id = #{deptId}
+ bd.id = #{deptId}::bigint
or bd.ancestors like concat('%',#{deptId},'%')
)
and bd.dept_category = 1
@@ -198,7 +200,7 @@
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}
+ and COALESCE(device_sn,'') != #{deviceSn}
and bd.id not in (
-- 排除当前部门的所有上级部门
select parent_dept.id
--
Gitblit v1.9.3