合并空行ＢＵＧ

yzg-util-db/src/main/java/com/yanzuoguang/excel/ExcelConsole.java

@@ -59,6 +59,10 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
      * 行号
      */
     private int rowIndex;
+    /**
+     * 行数据
+     */
+    private int rowData;
 
     /**
      * 合并列表組
@@ -309,6 +313,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         }
 
         rowIndex++;
+        rowData++;
 
         if (this.rowIndex % 100 == 0) {
             FileHelper.writeFile(new File(this.getFileNameRow()), StringHelper.toString(this.rowIndex), "utf-8");
@@ -363,6 +368,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             return this;
         }
         // 合并数据配置
+        if(this.rowData > 0){
             int columnPos = 0;
             for (ExportColumn column : this.config.getColumns()) {
                 mergerColumn(column, columnPos, true);
@@ -376,6 +382,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
                 }
                 columnPos++;
             }
+        }
 
         try {
             String fileNameTemp = this.getFileNameTemp();