From 99227c34ea9967aacc087138795d1b99965b0345 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 14:36:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 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 733ce17..995de6d 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
@@ -287,12 +287,13 @@
<if test="param2.deptName!=null and param2.deptName!=''">
and bd.dept_name like concat(concat('%', #{param2.deptName}),'%')
</if>
- <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}
+ and bd.area_code like concat(concat('%', #{param2.areaCode}),'%')
</if>
+ <if test="param2.deptCode!=null and param2.deptCode!=''">
+ and bd.dept_code = #{param2.deptCode}
+ </if>
+ ORDER BY bd.create_time DESC
</select>
<select id="exportDept" resultType="org.sxkj.system.excel.DeptExcel">
--
Gitblit v1.9.3