Browse Source

Merge 35a4be7243 into aae9c61ab6

pull/2656/merge
fluffycatkin 5 months ago committed by GitHub
parent
commit
f1cb7ceb53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java

5
easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java

@ -25,7 +25,7 @@ import com.alibaba.excel.write.metadata.MapRowData;
import com.alibaba.excel.write.metadata.RowData;
import com.alibaba.excel.write.metadata.holder.WriteHolder;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
@ -45,9 +45,10 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
if (CollectionUtils.isEmpty(data)) {
data = new ArrayList<>();
}
WriteTableHolder writeTableHolder = writeContext.writeTableHolder();
WriteSheetHolder writeSheetHolder = writeContext.writeSheetHolder();
int newRowIndex = writeSheetHolder.getNewRowIndexAndStartDoWrite();
if (writeSheetHolder.isNew() && !writeSheetHolder.getExcelWriteHeadProperty().hasHead()) {
if (writeSheetHolder.isNew() && !writeSheetHolder.getExcelWriteHeadProperty().hasHead() && (writeTableHolder ==null || !writeTableHolder.needHead())) {
newRowIndex += writeContext.currentWriteHolder().relativeHeadRowIndex();
}
int relativeRowIndex = 0;

Loading…
Cancel
Save