diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java index faf91dd..8713005 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java @@ -15,6 +15,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.util.ObjectUtils; import java.math.BigInteger; import java.util.*; @@ -254,6 +255,9 @@ List mergeIndexList = new ArrayList<>(); for (int i = 0; i <= positionIndex; i++) { XWPFTableRow row = table.getRow(i); + if (ObjectUtils.isEmpty(row)) { + continue; + } //标题合并行 while (colIndex < row.getTableCells().size()) { String titleText = row.getTableCells().get(colIndex).getText();