修复填充的时候 多次`forceNewRow` 空指针的bug #1201

src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java

@@ -138,11 +138,6 @@ public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
         } catch (IOException e) {
             throw new ExcelAnalysisException(e);
         }
-        // Sometimes tables lack the end record of the last column
-        if (!xlsReadContext.xlsReadSheetHolder().getCellMap().isEmpty()) {
-            // Forge a termination data
-            processRecord(new LastCellOfRowDummyRecord(xlsReadContext.xlsReadSheetHolder().getRowIndex() + 1, -1));
-        }
     }
 
     @Override

src/main/java/com/alibaba/excel/analysis/v03/handlers/EofRecordHandler.java

@@ -1,9 +1,16 @@
 package com.alibaba.excel.analysis.v03.handlers;
 
+import java.util.LinkedHashMap;
+
+import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord;
 import org.apache.poi.hssf.record.Record;
 
 import com.alibaba.excel.analysis.v03.IgnorableXlsRecordHandler;
 import com.alibaba.excel.context.xls.XlsReadContext;
+import com.alibaba.excel.enums.RowTypeEnum;
+import com.alibaba.excel.metadata.Cell;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.read.metadata.holder.xls.XlsReadSheetHolder;
 
 /**
  * Record handler
@@ -14,8 +21,21 @@ public class EofRecordHandler extends AbstractXlsRecordHandler implements Ignora
 
     @Override
     public void processRecord(XlsReadContext xlsReadContext, Record record) {
-        if (xlsReadContext.readSheetHolder() != null) {
-            xlsReadContext.analysisEventProcessor().endSheet(xlsReadContext);
+        if (xlsReadContext.readSheetHolder() == null) {
+            return;
+        }
+        // Sometimes tables lack the end record of the last column
+        if (!xlsReadContext.xlsReadSheetHolder().getCellMap().isEmpty()) {
+            XlsReadSheetHolder xlsReadSheetHolder = xlsReadContext.xlsReadSheetHolder();
+            // Forge a termination data
+            xlsReadContext.readRowHolder(new ReadRowHolder(xlsReadContext.xlsReadSheetHolder().getRowIndex() + 1,
+                xlsReadSheetHolder.getTempRowType(),
+                xlsReadContext.readSheetHolder().getGlobalConfiguration(), xlsReadSheetHolder.getCellMap()));
+            xlsReadContext.analysisEventProcessor().endRow(xlsReadContext);
+            xlsReadSheetHolder.setCellMap(new LinkedHashMap<Integer, Cell>());
+            xlsReadSheetHolder.setTempRowType(RowTypeEnum.EMPTY);
         }
+
+        xlsReadContext.analysisEventProcessor().endSheet(xlsReadContext);
     }
 }

src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java

@@ -94,7 +94,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
 
         Object realData;
         if (data instanceof FillWrapper) {
-            FillWrapper fillWrapper = (FillWrapper)data;
+            FillWrapper fillWrapper = (FillWrapper) data;
             currentDataPrefix = fillWrapper.getName();
             realData = fillWrapper.getCollectionData();
         } else {
@@ -106,7 +106,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         // processing data
         if (realData instanceof Collection) {
             List<AnalysisCell> analysisCellList = readTemplateData(templateCollectionAnalysisCache);
-            Collection collectionData = (Collection)realData;
+            Collection collectionData = (Collection) realData;
             if (CollectionUtils.isEmpty(collectionData)) {
                 return;
             }
@@ -156,9 +156,23 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
             return;
         }
         sheet.shiftRows(maxRowIndex + 1, lastRowIndex, number, true, false);
-        for (AnalysisCell analysisCell : templateAnalysisCache.get(currentUniqueDataFlag)) {
-            if (analysisCell.getRowIndex() > maxRowIndex) {
-                analysisCell.setRowIndex(analysisCell.getRowIndex() + number);
+
+        // The current data is greater than unity rowindex increase
+        String tablePrefix = tablePrefix(currentUniqueDataFlag);
+        increaseRowIndex(templateAnalysisCache, number, maxRowIndex, tablePrefix);
+        increaseRowIndex(templateCollectionAnalysisCache, number, maxRowIndex, tablePrefix);
+    }
+
+    private void increaseRowIndex(Map<String, List<AnalysisCell>> templateAnalysisCache, int number, int maxRowIndex,
+        String tablePrefix) {
+        for (Map.Entry<String, List<AnalysisCell>> entry : templateAnalysisCache.entrySet()) {
+            if (!tablePrefix.equals(tablePrefix(entry.getKey()))) {
+                continue;
+            }
+            for (AnalysisCell analysisCell : entry.getValue()) {
+                if (analysisCell.getRowIndex() > maxRowIndex) {
+                    analysisCell.setRowIndex(analysisCell.getRowIndex() + number);
+                }
             }
         }
     }
@@ -167,7 +181,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         Integer relativeRowIndex) {
         Map dataMap;
         if (oneRowData instanceof Map) {
-            dataMap = (Map)oneRowData;
+            dataMap = (Map) oneRowData;
         } else {
             dataMap = BeanMap.create(oneRowData);
         }
@@ -384,8 +398,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         int startIndex = 0;
         int length = value.length();
         int lastPrepareDataIndex = 0;
-        out:
-        while (startIndex < length) {
+        out: while (startIndex < length) {
             int prefixIndex = value.indexOf(FILL_PREFIX, startIndex);
             if (prefixIndex < 0) {
                 break out;
@@ -515,4 +528,8 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         return prefix + "-" + wrapperName;
     }
 
+    private String tablePrefix(String uniqueDataFlag) {
+        return uniqueDataFlag.substring(0, uniqueDataFlag.indexOf("-") + 1);
+    }
+
 }

src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java

@@ -32,7 +32,7 @@ public class Lock2Test {
 
     @Test
     public void test() throws Exception {
-        File file = new File("D:\\test\\headt1.xlsx");
+        File file = TestFileUtil.readUserHomeFile("test/t3.xls");
 
         List<Object> list = EasyExcel.read(file).sheet().headRowNumber(0).doReadSync();
         LOGGER.info("数据：{}", list.size());

update.md

@@ -3,6 +3,8 @@
 * 修复第一行为空不会调用`invokeHeadMap`的bug [Issue #993](https://github.com/alibaba/easyexcel/issues/993)
 * 当类的属性没有按照ExcelProperty的属性index顺序排序的时候，写数据出现错乱 [Issue #1046](https://github.com/alibaba/easyexcel/issues/1046)
 * 新增支持自定义转换器 入参可以为空 实现`NullableObjectConverter` 即可  [Issue #1084](https://github.com/alibaba/easyexcel/issues/1084)
+* 修复xls丢失结束标记的情况下 会漏读最后一行
+* 修复填充的时候 多次`forceNewRow` 空指针的bug [Issue #1201](https://github.com/alibaba/easyexcel/issues/1201)
 
 # 2.2.0-beta2
 * 修复最长匹配策略不同表格会有影响的bug [Issue #1010](https://github.com/alibaba/easyexcel/issues/1010)