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 |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 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 5a9b24d..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,11 +5,14 @@
 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;
 import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
@@ -45,12 +48,13 @@
     public static <T> void write(HttpServletResponse response, String filename, String sheetName,
                                  Class<T> head, List<T> data) throws IOException {
         // 杈撳嚭 Excel
-        ExcelWriter excelWriter = FastExcelFactory.write(response.getOutputStream(), head)
+        var builder = FastExcelFactory.write(response.getOutputStream(), head)
                 .autoCloseStream(false) // 涓嶈鑷姩鍏抽棴锛屼氦缁� Servlet 鑷繁澶勭悊
                 .registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 鍩轰簬 column 闀垮害锛岃嚜鍔ㄩ�傞厤銆傛渶澶� 255 瀹藉害
                 .registerWriteHandler(new SelectSheetWriteHandler(head)) // 鍩轰簬鍥哄畾 sheet 瀹炵幇涓嬫媺妗�
-                .registerConverter(new LongStringConverter()) // 閬垮厤 Long 绫诲瀷涓㈠け绮惧害
-                .build();
+                .registerConverter(new LongStringConverter()); // 閬垮厤 Long 绫诲瀷涓㈠け绮惧害
+        if (filename.contains("妯℃澘")) builder.registerWriteHandler(new RequiredHeaderWriteHandler());
+        ExcelWriter excelWriter = builder.build();
         try {
             excelWriter.write(data, FastExcelFactory.writerSheet(sheetName).build());
         } finally {
@@ -67,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());
+            }
+        });
     }
 
     /**
@@ -147,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