From e2e2971bfb519e50e64a7227b8c28bdef16974e0 Mon Sep 17 00:00:00 2001
From: lethal233 <11811407@mail.sustech.edu.cn>
Date: Wed, 19 May 2021 22:18:37 +0800
Subject: [PATCH] bugfix-1662

---
 .../property/ExcelWriteHeadProperty.java      |  4 +-
 .../test/temp/issue1662/Data1662.java         | 20 +++++++++
 .../test/temp/issue1662/Issue1662Test.java    | 42 +++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.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..2ba4ff9d 100644
--- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java
+++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java
@@ -158,7 +158,9 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty {
                 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).equals(headName)
+                        && (j - 1 >= 0)
+                        && !headList.get(k).getHeadNameList().get(j-1).equals(headName)) {
                         alreadyRangeSet.add(k + "-" + j);
                         lastCol = k;
                     } else {
diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java
new file mode 100644
index 00000000..53a1a5c8
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java
@@ -0,0 +1,20 @@
+package com.alibaba.easyexcel.test.temp.issue1662;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Data1662 {
+    @ExcelProperty(index = 0)
+    private String str;
+    @ExcelProperty(index = 1)
+    private Date date;
+    @ExcelProperty(index = 2)
+    private double r;
+}
diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java
new file mode 100644
index 00000000..5d311c45
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java
@@ -0,0 +1,42 @@
+package com.alibaba.easyexcel.test.temp.issue1662;
+
+import com.alibaba.easyexcel.test.util.TestFileUtil;
+import com.alibaba.excel.EasyExcel;
+import org.junit.Test;
+
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Issue1662Test {
+    @Test
+    public void test1662() {
+        String fileName = TestFileUtil.getPath() + "Test1939" + ".xlsx";
+        System.out.println(fileName);
+        EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList());
+    }
+
+
+    private List<List<String>> head() {
+        List<List<String>> list = new ArrayList<>();
+        List<String> head0 = new ArrayList<>();
+        List<String> head1 = new ArrayList<>();
+        head0.add("xx");
+        head0.add("日期");
+        list.add(head0);
+        head1.add("日期");
+        list.add(head1);
+        return list;
+    }
+
+    private List<List<Object>> dataList() {
+        List<List<Object>> list = new ArrayList<>();
+        List<Object> data = new ArrayList<>();
+        data.add("字符串");
+        data.add(new Date());
+        data.add(0.56);
+        list.add(data);
+        return list;
+    }
+}