From 9d60fa6745aa18a9ebdbd31112f995cf05454e47 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 9 Jun 2020 16:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D`includeColumnIndexes`?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=85=E5=90=AB=E7=AC=AC=E5=88=97=20=E4=BC=9A?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?bug=20#1346?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/metadata/property/ExcelHeadProperty.java       | 9 ++++-----
 .../excel/write/executor/ExcelWriteAddExecutor.java      | 1 +
 update.md                                                | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java
index 34109adc..5a035772 100644
--- a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java
+++ b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java
@@ -73,7 +73,7 @@ public class ExcelHeadProperty {
             int headIndex = 0;
             for (int i = 0; i < head.size(); i++) {
                 if (holder instanceof AbstractWriteHolder) {
-                    if (((AbstractWriteHolder)holder).ignore(null, i)) {
+                    if (((AbstractWriteHolder) holder).ignore(null, i)) {
                         continue;
                     }
                 }
@@ -130,9 +130,8 @@ public class ExcelHeadProperty {
                     index++;
                 }
             }
-            if (!initOneColumnProperty(holder, index, field, Boolean.FALSE)) {
-                index++;
-            }
+            initOneColumnProperty(holder, index, field, Boolean.FALSE);
+            index++;
         }
         for (Map.Entry<Integer, Field> entry : customFiledMap.entrySet()) {
             initOneColumnProperty(holder, entry.getKey(), entry.getValue(), Boolean.TRUE);
@@ -151,7 +150,7 @@ public class ExcelHeadProperty {
      */
     private boolean initOneColumnProperty(Holder holder, int index, Field field, Boolean forceIndex) {
         if (holder instanceof AbstractWriteHolder) {
-            if (((AbstractWriteHolder)holder).ignore(field.getName(), index)) {
+            if (((AbstractWriteHolder) holder).ignore(field.getName(), index)) {
                 return true;
             }
         }
diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
index d25ee941..728703ef 100644
--- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
+++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
@@ -156,6 +156,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
             boolean uselessData = !beanMap.containsKey(filedName) || beanMapHandledSet.contains(filedName)
                 || ignoreMap.containsKey(filedName) || writeContext.currentWriteHolder().ignore(filedName, cellIndex);
             if (uselessData) {
+                cellIndex++;
                 continue;
             }
             Object value = beanMap.get(filedName);
diff --git a/update.md b/update.md
index 6635fa4f..95140c02 100644
--- a/update.md
+++ b/update.md
@@ -8,6 +8,7 @@
 * 修复xls仅公式行 不读取的bug [Issue #1324](https://github.com/alibaba/easyexcel/issues/1324)
 * 修复xls直接读取第2页 `NPE` 的bug [Issue #1280](https://github.com/alibaba/easyexcel/issues/1280)
 * 修复填充的时候，最后一行中间有空行会创建失败的bug
+* 修复`includeColumnIndexes`不包含第列 会无法导出数据的bug [Issue #1346](https://github.com/alibaba/easyexcel/issues/1346)
 
 # 2.2.3
 * 修改填充数据空数据的bug  [Issue #1274](https://github.com/alibaba/easyexcel/issues/1274)