From 595faeff5d994f7921c6dd7db1a5987a885894bb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 15:16:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 38f8abe..733ce17 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
@@ -278,9 +278,10 @@
<select id="selectDeptPage" resultType="org.sxkj.system.vo.DeptVO">
SELECT
- bd.*
+ bd.*,
+ br.name AS area_name
FROM
- blade_dept bd
+ blade_dept bd LEFT JOIN blade_region br ON br.code = bd.area_code
WHERE
bd.is_deleted = 0
<if test="param2.deptName!=null and param2.deptName!=''">
@@ -289,6 +290,30 @@
<if test="param2.fullName!=null and param2.fullName!=''">
and bd.full_name like concat(concat('%', #{param2.fullName}),'%')
</if>
+ <if test="param2.areaCode!=null and param2.areaCode!=''">
+ and bd.area_code = #{param2.areaCode}
+ </if>
+ </select>
+
+ <select id="exportDept" resultType="org.sxkj.system.excel.DeptExcel">
+ SELECT
+ bd.*,
+ br.name AS area_name
+ FROM
+ blade_dept bd
+ LEFT JOIN
+ blade_region br ON br.code = bd.area_code
+ WHERE
+ bd.is_deleted = 0
+ <if test="deptName!=null and deptName!=''">
+ and bd.dept_name like concat(concat('%', #{deptName}),'%')
+ </if>
+ <if test="fullName!=null and fullName!=''">
+ and bd.full_name like concat(concat('%', #{fullName}),'%')
+ </if>
+ <if test="areaCode!=null and areaCode!=''">
+ and bd.area_code = #{areaCode}
+ </if>
</select>
--
Gitblit v1.9.3