From a350201c5b7fc32b6395b9a59efc0b175176eb11 Mon Sep 17 00:00:00 2001 From: xfworld Date: Mon, 4 Jan 2016 16:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java index 4f627b3..6b3a352 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java @@ -163,7 +163,7 @@ public final class PoiMergeCellUtil { if (delys == null || delys.length == 0) { return mergeEntity.getText().equals(text); } - // 存在依赖关系 + // 存在依赖关系 测试 if (mergeEntity.getText().equals(text)) { for (int i = 0; i < delys.length; i++) { if (mergeEntity.getRelyList().get(i) ==null || !mergeEntity.getRelyList().get(i).equals(getCellNotNullText(cell, delys[i], rowNum))) {