From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Mon, 09 Feb 2026 11:00:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java index 208b2fe..771999a 100644 --- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java +++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java @@ -23,6 +23,7 @@ import org.sxkj.common.node.TreeStringNode; import org.sxkj.system.entity.Dept; import org.sxkj.system.excel.DeptExcel; +import org.sxkj.system.excel.DeptImportExcel; import org.sxkj.system.param.DeptExportParam; import org.sxkj.system.param.DeptPageParam; import org.sxkj.system.vo.DeptVO; @@ -202,7 +203,7 @@ * @param data * @param isCovered */ - void importDept(List<DeptExcel> data, Boolean isCovered); + void importDept(List<DeptImportExcel> data, Boolean isCovered); /** * 导出部门 @@ -211,4 +212,12 @@ * @return */ List<DeptExcel> exportDept(DeptExportParam dept); + + /** + * 获取部门详情（包含区域名称） + * + * @param dept 部门对象，包含查询条件 + * @return 部门详情VO，包含区域名称 + */ + DeptVO getDetailWithAreaName(Dept dept); } -- Gitblit v1.9.3