From e0cb0b2e90d087a0917aa75fa7e560afe3446cdf Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Fri, 06 Feb 2026 11:40:05 +0800
Subject: [PATCH] update-用户同步

---
 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 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 5974fb0..a73b7b7 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,11 +287,11 @@
         <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>
@@ -315,6 +315,31 @@
         <if test="areaCode!=null and areaCode!=''">
             and bd.area_code = #{areaCode}
         </if>
+        <if test="deptIds!=null and deptIds.size()>0">
+            and bd.id in
+            <foreach item="item" index="index" collection="deptIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <!--获取部门详情(包含区域名称)-->
+    <select id="getDetailWithAreaName" resultType="org.sxkj.system.vo.DeptVO">
+        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="dept.id!=null">
+            and bd.id = #{dept.id}
+        </if>
+        <if test="dept.deptCode!=null and dept.deptCode!=''">
+            and bd.dept_code = #{dept.deptCode}
+        </if>
     </select>
 
 

--
Gitblit v1.9.3