From 0f4aa5957957d9124e88da4490fac60da5324058 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 14 十一月 2026 10:43:34 +0800
Subject: [PATCH] fix(excel): 兼容模板表头必填星号并完善部门/岗位导入校验
---
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
index b2bd788..2c1bbd9 100644
--- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
@@ -5,9 +5,11 @@
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.context.AnalysisContext;
import cn.idev.excel.converters.longconverter.LongStringConverter;
+import cn.idev.excel.enums.CellDataTypeEnum;
import cn.idev.excel.enums.CellExtraTypeEnum;
import cn.idev.excel.event.AnalysisEventListener;
import cn.idev.excel.metadata.CellExtra;
+import cn.idev.excel.metadata.data.ReadCellData;
import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy;
import cn.iocoder.yudao.framework.excel.core.handler.RequiredHeaderWriteHandler;
@@ -69,12 +71,51 @@
}
public static <T> List<T> read(MultipartFile file, Class<T> head) throws IOException {
+ AnalysisEventListener<T> headerNormalizeListener = new AnalysisEventListener<>() {
+ @Override
+ public void invokeHead(Map<Integer, ReadCellData<?>> headMap, AnalysisContext context) {
+ normalizeHeadCells(headMap);
+ }
+
+ @Override
+ public void invoke(T data, AnalysisContext context) {
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ }
+ };
// 鍙傝�� https://t.zsxq.com/zM77F 甯栧瓙锛屽鍔� try 澶勭悊锛屽吋瀹� windows 鍦烘櫙
try (InputStream inputStream = file.getInputStream()) {
- return FastExcelFactory.read(inputStream, head, null)
+ return FastExcelFactory.read(inputStream, head, headerNormalizeListener)
.autoCloseStream(false) // 涓嶈鑷姩鍏抽棴锛屼氦缁� Servlet 鑷繁澶勭悊
.doReadAllSync();
}
+ }
+
+ /**
+ * 鍘绘帀琛ㄥご鍓嶉潰鐨勫繀濉槦鍙枫��
+ *
+ * <p>瀵煎嚭妯℃澘鏃讹紝{@link RequiredHeaderWriteHandler} 浼氱粰蹇呭~鍒楃殑琛ㄥご鍔犱笂 "*" 鍓嶇紑锛堝 "*閮ㄩ棬鍚嶇О"锛夛紝
+ * 鑰屽鍏ユ椂 {@link ExcelProperty} 鏄寜绮剧‘琛ㄥご鍖归厤鐨勶紙濡� "閮ㄩ棬鍚嶇О"锛夈�傚鏋滀笉鍘绘帀鏄熷彿锛�
+ * 鏁村垪閮戒細缁戝畾涓嶄笂锛屽瓧娈靛叏鏄� null锛屽鍏ヤ細鎶�"绯荤粺寮傚父"銆�
+ *
+ * <p>璇ユ柟娉曞湪 {@code buildHead} 涔嬪墠淇敼琛ㄥご鍗曞厓鏍肩殑鍊硷紝鍥犳鏃㈠吋瀹瑰甫鏄熷彿鐨勬ā鏉匡紝
+ * 涔熷吋瀹圭敤鎴锋墜宸ュ幓鎺夋槦鍙风殑鏂囦欢銆�
+ */
+ private static void normalizeHeadCells(Map<Integer, ReadCellData<?>> headMap) {
+ if (headMap == null) {
+ return;
+ }
+ headMap.values().forEach(cellData -> {
+ if (cellData == null || cellData.getType() != CellDataTypeEnum.STRING) {
+ return;
+ }
+ String value = cellData.getStringValue();
+ if (value != null && value.startsWith("*")) {
+ cellData.setStringValue(value.substring(1).trim());
+ }
+ });
}
/**
@@ -149,6 +190,11 @@
}
@Override
+ public void invokeHead(Map<Integer, ReadCellData<?>> headMap, AnalysisContext context) {
+ normalizeHeadCells(headMap);
+ }
+
+ @Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
sheetHeaderMap.put(context.readSheetHolder().getSheetNo(), headMap);
}
--
Gitblit v1.9.3