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/controller/DeptController.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
index 0a8e9c0..616a110 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
@@ -60,6 +60,7 @@
import org.sxkj.system.param.DeptExportParam;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.service.IDeptService;
+import org.sxkj.system.util.excel.DeptSheetWriteHandler;
import org.sxkj.system.util.excel.RegionSheetWriteHandler;
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;
@@ -101,8 +102,8 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入dept")
public R<DeptVO> detail(Dept dept) {
- Dept detail = deptService.getOne(Condition.getQueryWrapper(dept));
- return R.data(DeptWrapper.build().entityVO(detail));
+ DeptVO detail = deptService.getDetailWithAreaName(dept);
+ return R.data(detail);
}
/**
@@ -367,12 +368,6 @@
/**
* 导出模板
- * <p>
- * 为区域列添加下拉选择功能，限制用户只能选择预设的区域名称
- * </p>
- *
- * @param response HTTP响应对象
- * @throws IOException 导出异常
*/
@GetMapping("export-template")
@ApiOperationSupport(order = 16)
@@ -389,7 +384,7 @@
// 使用EasyExcel导出，并注册RegionSheetWriteHandler
EasyExcel.write(response.getOutputStream(), DeptImportExcel.class)
- .registerWriteHandler(new RegionSheetWriteHandler())
+ .registerWriteHandler(new DeptSheetWriteHandler())
.sheet("机构表")
.doWrite(list);
}
--
Gitblit v1.9.3