From 6cf5ecc4d821c0d71edb0d60b37dede914f1ca66 Mon Sep 17 00:00:00 2001 From: anqi Date: Fri, 8 May 2015 19:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=B5=E5=90=91=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecgframework/poi/excel/export/base/ExcelExportBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java index 091049e..b0c2912 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java @@ -80,7 +80,7 @@ public abstract class ExcelExportBase extends ExportBase { } // 存在依赖关系 if (mergeEntity.getText().equals(text)) { - for (int i = 0; i > delys.length; i++) { + for (int i = 0; i < delys.length; i++) { if (!getCellNotNullText(cell, delys[i], rowNum).equals( mergeEntity.getRelyList().get(i))) { return false; @@ -483,7 +483,7 @@ public abstract class ExcelExportBase extends ExportBase { } } if (mergeDataMap.size() > 0) { - for (Integer index : sets) { + for (Integer index : mergeDataMap.keySet()) { sheet.addMergedRegion(new CellRangeAddress(mergeDataMap.get(index).getStartRow(), mergeDataMap.get(index).getEndRow(), index, index)); }