From 019f3dd14f140a3381aec0bb696e3a84f76c45e4 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 14:12:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 3e97a06..38f8abe 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
@@ -276,6 +276,20 @@
         AND r.code = #{areaCode}
     </select>
 
+    <select id="selectDeptPage" resultType="org.sxkj.system.vo.DeptVO">
+        SELECT
+            bd.*
+        FROM
+            blade_dept bd
+        WHERE
+            bd.is_deleted = 0
+        <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>
+    </select>
 
 
 </mapper>

--
Gitblit v1.9.3