From 802eb7d6cfb89b81c68abe5305bd9342ba7286a6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 10 十二月 2025 17:36:21 +0800
Subject: [PATCH] 采集器调整2

---
 src/main/java/com/chinaztt/mes/docx/util/TakeWords.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
index 58fb34a..861d5ad 100644
--- a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
+++ b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
@@ -74,12 +74,14 @@
             //鑾峰彇鏈�鍚庝竴琛岀殑num锛屽嵆鎬昏鏁般�傛澶勪粠0寮�濮�
             int maxRow = sheet.getLastRowNum();
             for (int row = 0; row <= maxRow; row++) {
-                int maxRol = sheet.getRow(row).getLastCellNum();
-                StringBuilder aLine = new StringBuilder();
-                for (int rol = 0; rol < maxRol; rol++) {
-                    aLine.append(sheet.getRow(row).getCell(rol)).append(splitIdentifier);
+                if(Objects.nonNull(sheet.getRow(row))){
+                    int maxRol = sheet.getRow(row).getLastCellNum();
+                    StringBuilder aLine = new StringBuilder();
+                    for (int rol = 0; rol < maxRol; rol++) {
+                        aLine.append(sheet.getRow(row).getCell(rol)).append(splitIdentifier);
+                    }
+                    result.append(aLine).append("\n");
                 }
-                result.append(aLine).append("\n");
             }
         } catch (Exception e) {
             e.printStackTrace();

--
Gitblit v1.9.3