From b4545debd1460ac10c162dc1477b730d846a6e91 Mon Sep 17 00:00:00 2001
From: smireg <402809775@qq.com>
Date: Sun, 18 Apr 2021 18:24:05 +0800
Subject: [PATCH] bugfix1765

---
 .../property/ExcelWriteHeadProperty.java      |   4 +-
 .../test/demo/Test1765/Data1765.xlsx          | Bin 0 -> 3687 bytes
 .../test/demo/Test1765/Issue1765.java         |  55 ++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Data1765.xlsx
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Issue1765.java

diff --git a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java
index 979a7750..aa4893e5 100644
--- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java
+++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java
@@ -154,11 +154,11 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty {
                     continue;
                 }
                 alreadyRangeSet.add(i + "-" + j);
-                String headName = headNameList.get(j);
+                String headName = headNameList.get(j) == null ? "" : headNameList.get(j);
                 int lastCol = i;
                 int lastRow = j;
                 for (int k = i + 1; k < headList.size(); k++) {
-                    if (headList.get(k).getHeadNameList().get(j).equals(headName)) {
+                    if ((headList.get(k).getHeadNameList().get(j) == null ? "" : headList.get(k).getHeadNameList().get(j)).equals(headName)) {
                         alreadyRangeSet.add(k + "-" + j);
                         lastCol = k;
                     } else {
diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Data1765.xlsx b/src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Data1765.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..3377bb760f7a27ff706a43fda2d77dd6dd323ab7
GIT binary patch
literal 3687
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
YQ4k|tDk6yh01)v~AuiKNdeX0d0kp*88vp<R

literal 0
HcmV?d00001

diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Issue1765.java b/src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Issue1765.java
new file mode 100644
index 00000000..7d9f572a
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Issue1765.java
@@ -0,0 +1,55 @@
+package com.alibaba.easyexcel.test.demo.Test1765;
+
+import com.alibaba.easyexcel.test.util.TestFileUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.EasyExcelFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Issue1765 {
+    @Test
+    public void test1765() throws FileNotFoundException {
+        String fileName = "src/test/java/com/alibaba/easyexcel/test/demo/Test1765/Data1765.xlsx";
+        EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList());
+    }
+
+
+    private List<List<String>> head() {
+        List<List<String>> list = new ArrayList<List<String>>();
+        List<String> head0 = new ArrayList<String>();
+        List<String> head1 = new ArrayList<String>();
+        List<String> head2 = new ArrayList<String>();
+        List<String> head3 = new ArrayList<String>();
+        head0.add("表头");
+        head1.add("日期");
+        head2.add(null);
+        head3.add("数字");
+        list.add(head0);
+        list.add(head1);
+        list.add(head2);
+        list.add(head3);
+
+        return list;
+    }
+
+    private List<List<Object>> dataList() {
+        List<List<Object>> list = new ArrayList<List<Object>>();
+        for (int i = 0; i < 5; i++) {
+            List<Object> data = new ArrayList<Object>();
+            data.add("字符串" + i);
+            data.add(new Date());
+            data.add(i * 2);
+            data.add(i * 3);
+            list.add(data);
+        }
+        return list;
+    }
+}