Pre Merge pull request !441 from ms/springboot3

fix(importExcel):修复导入时表头匹配问题
2026-01-27 12:11:56 +08:00 · 2025-12-02 05:14:10 +00:00 · 2025-12-02 10:15:15 +08:00
1 changed files with 1649 additions and 1646 deletions
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -338,7 +338,10 @@ public class ExcelUtil<T>
            Map<String, Integer> cellMap = new HashMap<String, Integer>();
            // 获取表头
            Row heard = sheet.getRow(titleNum);
-            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+            if (heard == null) {
+                throw new UtilException("文件标题行为空，请检查Excel文件格式");
+            }
+            for (int i = 0; i < heard.getLastCellNum(); i++) // getPhysicalNumberOfCells()容易导致列索引错位
            {
                Cell cell = heard.getCell(i);
                if (StringUtils.isNotNull(cell))
Author	SHA1	Message	Date
ms	39e9b413a0	Pre Merge pull request !441 from ms/springboot3	2025-12-02 05:14:10 +00:00
ms	b69f65e91d	fix(importExcel):修复导入时表头匹配问题	2025-12-02 10:15:15 +08:00