From 843a8a70603f878ad38727c04b63bcdad0ad5685 Mon Sep 17 00:00:00 2001 From: jueyue Date: Fri, 18 Oct 2019 15:33:15 +0800 Subject: [PATCH] =?UTF-8?q?shfit=20=E7=9A=84=E6=97=B6=E5=80=99=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easypoi/excel/entity/params/ExcelForEachParams.java | 2 +- .../excel/export/template/ExcelExportOfTemplateUtil.java | 2 +- .../easypoi/excel/export/template/TemplateSumHandler.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelForEachParams.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelForEachParams.java index b47c9ef..bf2d8ec 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelForEachParams.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelForEachParams.java @@ -52,7 +52,7 @@ public class ExcelForEachParams implements Serializable { */ private boolean collectCell; - private boolean needSum; + private boolean needSum; public ExcelForEachParams() { diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java index 895d000..d4e68f4 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -154,7 +154,7 @@ public final class ExcelExportOfTemplateUtil extends BaseExportService { rowIndex += rowspan - 1 + loopSize - 1; } //修复不论后面有没有数据,都应该执行的是插入操作 - if (isShift && datas.size() * rowspan > 1 && cell.getRowIndex() + rowspan < cell.getRow().getSheet().getLastRowNum()) { + if (isShift && datas.size() * rowspan > 1 && cell.getRowIndex() + rowspan <= cell.getRow().getSheet().getLastRowNum()) { int lastRowNum = cell.getRow().getSheet().getLastRowNum(); int shiftRows = lastRowNum - cell.getRowIndex() - rowspan; cell.getRow().getSheet().shiftRows(cell.getRowIndex() + rowspan, lastRowNum, (datas.size() - 1) * rowspan, true, true); diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/TemplateSumHandler.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/TemplateSumHandler.java index 1ea5cc4..9f20361 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/TemplateSumHandler.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/TemplateSumHandler.java @@ -99,7 +99,7 @@ public class TemplateSumHandler { */ public void shiftRows(int rowIndex, int size) { for (TemplateSumEntity entity : getDataList()) { - if (entity.getRow() > rowIndex) { + if (entity.getRow() >= rowIndex) { entity.setRow(entity.getRow() + size); } }