From 8eefac7a9b2b6ac0e7b005e1ae4e3e0bdf8e3f7f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 27 Jan 2026 15:02:46 +0800
Subject: [PATCH] 机构优化

---
 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java
index e78bd60..d26685e 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java
@@ -16,12 +16,17 @@
  */
 package org.sxkj.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.sxkj.common.node.TreeStringNode;
 import org.sxkj.system.entity.Dept;
+import org.sxkj.system.excel.DeptExcel;
+import org.sxkj.system.param.DeptExportParam;
+import org.sxkj.system.param.DeptPageParam;
 import org.sxkj.system.vo.DeptVO;
 
 import java.util.List;
@@ -60,7 +65,7 @@
 	 * @param parentId
 	 * @return
 	 */
-	List<DeptVO> lazyTree(String tenantId, Long parentId,Integer level);
+	List<DeptVO> lazyTree(String tenantId, Long parentId, Integer level);
 
 	/**
 	 * 获取部门名
@@ -72,6 +77,7 @@
 
 	/**
 	 * 获取部门树形结构
+	 *
 	 * @param deptId
 	 * @return
 	 */
@@ -80,6 +86,7 @@
 
 	/**
 	 * 自定义详情查询-根据系统配置id
+	 *
 	 * @param dept
 	 * @return
 	 */
@@ -87,6 +94,7 @@
 
 	/**
 	 * 下拉机构列表查询
+	 *
 	 * @param deptId
 	 * @return
 	 */
@@ -94,6 +102,7 @@
 
 	/**
 	 * 查询父级机构信息(一级机构)
+	 *
 	 * @param deptId
 	 * @return
 	 */
@@ -101,19 +110,39 @@
 
 	/**
 	 * 查询机构树(除本机机构以外的机构)
+	 *
 	 * @param deptId
 	 * @return
 	 */
 	@MapKey("id")
-    Map<String, TreeStringNode> getDeptTreeByNotItself(@Param("deptId") String deptId,@Param("deviceSn") String deviceSn);
+	Map<String, TreeStringNode> getDeptTreeByNotItself(@Param("deptId") String deptId, @Param("deviceSn") String deviceSn);
 
 	/**
 	 * 懒加载获取部门树形结构(子集)
+	 *
 	 * @param parentId
 	 * @return
 	 */
-	List<DeptVO> getChildLazyTree(Long parentId,Map<String, Object> param);
+	List<DeptVO> getChildLazyTree(Long parentId, Map<String, Object> param);
 
 	String getFullRegionName(String areaCode);
+
 	String getSingleRegionName(String areaCode);
+
+	/**
+	 * 查询部门分页数据
+	 *
+	 * @param page
+	 * @param deptPageParam
+	 * @return
+	 */
+	IPage<DeptVO> selectDeptPage(IPage<DeptVO> page, DeptPageParam deptPageParam);
+
+	/**
+	 * 导出部门数据
+	 *
+	 * @param deptExportParam
+	 * @return
+	 */
+	List<DeptExcel> exportDept(DeptExportParam deptExportParam);
 }

--
Gitblit v1.9.3