From 897812008d0e806eca26e5f607432e222320adc8 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 9 Jun 2020 18:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BB=A3=E7=A0=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +
 .../executor/ExcelWriteFillExecutor.java      | 70 +++++++++++--------
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55f5f6d..be70e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,8 @@
                         <exclude>com/alibaba/excel/event/AnalysisEventListener.java</exclude>
                         <exclude>com/alibaba/excel/metadata/DataFormatter.java</exclude>
                         <exclude>com/alibaba/excel/util/DateUtils.java</exclude>
+                        <exclude>com/alibaba/excel/metadata/format/DataFormatter.java</exclude>
+                        <exclude>com/alibaba/excel/metadata/format/ExcelGeneralNumberFormat.java</exclude>
                     </excludes>
                 </configuration>
                 <executions>
diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
index 383d31f..29a037a 100644
--- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
+++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
@@ -295,34 +295,9 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
             default:
                 throw new ExcelGenerateException("The wrong direction.");
         }
-        Row row = sheet.getRow(lastRowIndex);
-        if (row == null) {
-            row = cachedSheet.getRow(lastRowIndex);
-            if (row == null) {
-                WriteHandlerUtils.beforeRowCreate(writeContext, lastRowIndex, null, Boolean.FALSE);
-                if (fillConfig.getForceNewRow()) {
-                    row = cachedSheet.createRow(lastRowIndex);
-                } else {
-                    // The last row of the middle disk inside empty rows, resulting in cachedSheet can not get inside.
-                    // Will throw Attempting to write a row[" + rownum + "] " + "in the range [0," + this._sh.getLastRowNum() + "] that is already written to disk.
-                    try{
-                        row = sheet.createRow(lastRowIndex);
-                    }catch (IllegalArgumentException ignore){
-                        row = cachedSheet.createRow(lastRowIndex);
-                    }
-                }
-                checkRowHeight(analysisCell, fillConfig, isOriginalCell, row);
-                WriteHandlerUtils.afterRowCreate(writeContext, row, null, Boolean.FALSE);
-            } else {
-                checkRowHeight(analysisCell, fillConfig, isOriginalCell, row);
-            }
-        }
-        Cell cell = row.getCell(lastColumnIndex);
-        if (cell == null) {
-            WriteHandlerUtils.beforeCellCreate(writeContext, row, null, lastColumnIndex, null, Boolean.FALSE);
-            cell = row.createCell(lastColumnIndex);
-            WriteHandlerUtils.afterCellCreate(writeContext, cell, null, null, Boolean.FALSE);
-        }
+
+        Row row = createRowIfNecessary(sheet, cachedSheet, lastRowIndex, fillConfig, analysisCell, isOriginalCell);
+        Cell cell = createCellIfNecessary(row,lastColumnIndex);
 
         Map<AnalysisCell, CellStyle> collectionFieldStyleMap = collectionFieldStyleCache.get(currentUniqueDataFlag);
         if (collectionFieldStyleMap == null) {
@@ -340,6 +315,45 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         return cell;
     }
 
+    private Cell createCellIfNecessary(Row row, Integer lastColumnIndex) {
+        Cell cell = row.getCell(lastColumnIndex);
+        if (cell != null) {
+            return cell;
+        }
+        WriteHandlerUtils.beforeCellCreate(writeContext, row, null, lastColumnIndex, null, Boolean.FALSE);
+        cell = row.createCell(lastColumnIndex);
+        WriteHandlerUtils.afterCellCreate(writeContext, cell, null, null, Boolean.FALSE);
+        return cell;
+    }
+
+    private Row createRowIfNecessary(Sheet sheet, Sheet cachedSheet, Integer lastRowIndex, FillConfig fillConfig,
+        AnalysisCell analysisCell, boolean isOriginalCell) {
+        Row row = sheet.getRow(lastRowIndex);
+        if (row != null) {
+            return row;
+        }
+        row = cachedSheet.getRow(lastRowIndex);
+        if (row == null) {
+            WriteHandlerUtils.beforeRowCreate(writeContext, lastRowIndex, null, Boolean.FALSE);
+            if (fillConfig.getForceNewRow()) {
+                row = cachedSheet.createRow(lastRowIndex);
+            } else {
+                // The last row of the middle disk inside empty rows, resulting in cachedSheet can not get inside.
+                // Will throw Attempting to write a row[" + rownum + "] " + "in the range [0," + this._sh.getLastRowNum() + "] that is already written to disk.
+                try {
+                    row = sheet.createRow(lastRowIndex);
+                } catch (IllegalArgumentException ignore) {
+                    row = cachedSheet.createRow(lastRowIndex);
+                }
+            }
+            checkRowHeight(analysisCell, fillConfig, isOriginalCell, row);
+            WriteHandlerUtils.afterRowCreate(writeContext, row, null, Boolean.FALSE);
+        } else {
+            checkRowHeight(analysisCell, fillConfig, isOriginalCell, row);
+        }
+        return row;
+    }
+
     private void checkRowHeight(AnalysisCell analysisCell, FillConfig fillConfig, boolean isOriginalCell, Row row) {
         if (!analysisCell.getFirstRow() || !WriteDirectionEnum.VERTICAL.equals(fillConfig.getDirection())) {
             return;
-- 
GitLab