From 67e4e10d86a6f3dfe4d647b7b25487c9a30193fd Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Thu, 7 Nov 2019 18:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=BA=E5=88=B6=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=96=B0=E8=A1=8C=E5=A1=AB=E5=85=85=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E8=A1=8C=E6=95=B0=E6=8D=AE=E4=BC=9A=E6=9C=AA?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                         |  2 +-
 .../write/executor/ExcelWriteFillExecutor.java  |  3 +++
 .../easyexcel/test/temp/FillTempTest.java       | 17 +++++++++++++----
 .../easyexcel/test/temp/fill/FillData2.java     | 11 +++++++++++
 update.md                                       |  1 +
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java

diff --git a/pom.xml b/pom.xml
index 7dad24da..c818dd34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba</groupId>
     <artifactId>easyexcel</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <packaging>jar</packaging>
     <name>easyexcel</name>
 
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 800b7c07..473d4e34 100644
--- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
+++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
@@ -127,6 +127,9 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         if (collectionLastIndexMap == null) {
             number--;
         }
+        if (number <= 0) {
+            return;
+        }
         sheet.shiftRows(maxRowIndex + 1, lastRowIndex, number, true, false);
         for (AnalysisCell analysisCell : templateAnalysisCache.get(writeContext.writeSheetHolder().getSheetNo())) {
             if (analysisCell.getRowIndex() > maxRowIndex) {
diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java b/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java
index 6c82082d..8049d89c 100644
--- a/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java
+++ b/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java
@@ -1,6 +1,5 @@
 package com.alibaba.easyexcel.test.temp;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -10,12 +9,12 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import com.alibaba.easyexcel.test.demo.fill.FillData;
+import com.alibaba.easyexcel.test.temp.fill.FillData2;
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
-import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy;
 
 /**
  * 写的填充写法
@@ -46,7 +45,7 @@ public class FillTempTest {
         // 如果数据量大 list不是最后一行 参照下一个
         FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
         excelWriter.fill(data(), fillConfig, writeSheet);
-        excelWriter.fill(data(), fillConfig, writeSheet);
+//        excelWriter.fill(data2(), fillConfig, writeSheet);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("date", "2019年10月9日13:28:28");
         map.put("total", 1000);
@@ -73,7 +72,7 @@ public class FillTempTest {
         WriteSheet writeSheet = EasyExcel.writerSheet().build();
         // 直接写入数据
         excelWriter.fill(data(), writeSheet);
-        excelWriter.fill(data(), writeSheet);
+        excelWriter.fill(data2(), writeSheet);
 
         // 写入list之前的数据
         Map<String, Object> map = new HashMap<String, Object>();
@@ -97,6 +96,16 @@ public class FillTempTest {
         // 新建一个 然后一点点复制过来的方案，最后导致list需要新增行的时候，后面的列的数据没法后移，后续会继续想想解决方案
     }
 
+    private List<FillData2> data2() {
+        List<FillData2> list = new ArrayList<FillData2>();
+        for (int i = 0; i < 10; i++) {
+            FillData2 fillData = new FillData2();
+            list.add(fillData);
+            fillData.setTest("ttttttt" + i);
+        }
+        return list;
+    }
+
     private List<FillData> data() {
         List<FillData> list = new ArrayList<FillData>();
         for (int i = 0; i < 10; i++) {
diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java b/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java
new file mode 100644
index 00000000..17c34cf1
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java
@@ -0,0 +1,11 @@
+package com.alibaba.easyexcel.test.temp.fill;
+
+import lombok.Data;
+
+/**
+ * @author Jiaju Zhuang
+ */
+@Data
+public class FillData2 {
+    private String test;
+}
diff --git a/update.md b/update.md
index eaaed2bf..4b6e5a49 100644
--- a/update.md
+++ b/update.md
@@ -1,4 +1,5 @@
 # 2.1.2
+* 修复强制创建新行填充，只有一行数据会未填充的bug
 
 # 2.1.1
 * 发布正式版