From 2b161b1f1401c89fa927e390d78ff49568337f6c Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 11:27:03 +0800
Subject: [PATCH] fix: 修复 Map.of() 空集合导致的 NPE（组织/证件等未关联员工时接口 500）
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
index 5e33b96..cc1bdcd 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
@@ -101,11 +101,21 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱瀵煎叆閮ㄩ棬妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
+ // 绀轰緥鐨勪笂绾ч儴闂ㄥ彇褰撳墠鐪熷疄鏍归儴闂紝閬垮厤鐓ф妱 demo 閲岀殑銆屾�诲叕鍙搞�嶅鑷存壘涓嶅埌涓婄骇
+ List<DeptDO> allDepts = deptService.getDeptList(new DeptListReqVO());
+ String rootPath = allDepts.stream()
+ .filter(d -> d.getParentId() == null || d.getParentId() == 0)
+ .map(DeptDO::getName)
+ .findFirst()
+ .orElse("璇峰～鍐欎笂绾ч儴闂ㄥ叏璺緞");
+
List<DeptImportExcelVO> list = Arrays.asList(
- DeptImportExcelVO.builder().name("鐮斿彂閮�").parentPath("鎬诲叕鍙�").sort(1).status(CommonStatusEnum.ENABLE.getStatus()).build(),
- DeptImportExcelVO.builder().name("璐㈠姟閮�").parentPath("鎬诲叕鍙�").sort(2).status(CommonStatusEnum.ENABLE.getStatus()).build()
+ DeptImportExcelVO.builder().name("绀轰緥閮ㄩ棬A").parentPath(rootPath).sort(1)
+ .status(CommonStatusEnum.ENABLE.getStatus()).build(),
+ DeptImportExcelVO.builder().name("绀轰緥閮ㄩ棬B").parentPath(rootPath).sort(2)
+ .status(CommonStatusEnum.ENABLE.getStatus()).build()
);
- ExcelUtils.write(response, "閮ㄩ棬瀵煎叆妯℃澘.xls", "閮ㄩ棬鍒楄〃", DeptImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閮ㄩ棬瀵煎叆妯℃澘.xls", "閮ㄩ棬鍒楄〃", DeptImportExcelVO.class, list);
}
@PostMapping("/import")
--
Gitblit v1.9.3