From cafa308672b55e0bc68bb10c0afef4a352d6e064 Mon Sep 17 00:00:00 2001 From: jueyue Date: Sat, 17 Oct 2015 19:07:38 +0800 Subject: [PATCH] =?UTF-8?q?#=2031=20amountToMove=20must=20not=20be=20zero?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=95=8A=20=E4=B8=80=E8=A1=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=A7=BB=E5=8A=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poi/excel/export/template/ExcelExportOfTemplateUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java index ec1bd26..0441a77 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -377,9 +377,9 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { rowspan, colspan, mergedRegionHelper); rowIndex += rowspan - 1; } - if (isShift) { + if (isShift && datas.size() * rowspan > 1) { cell.getRow().getSheet().shiftRows(cell.getRowIndex() + 1, - cell.getRow().getSheet().getLastRowNum(), (datas.size() - 1) * rowspan, true, true); + cell.getRow().getSheet().getLastRowNum(), datas.size() * rowspan - 1, true, true); } while (its.hasNext()) { Object t = its.next();