From 40411025dceb052cd7d7691f1616fc5466ce07ce Mon Sep 17 00:00:00 2001 From: jueyue Date: Thu, 10 Dec 2015 22:20:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC,?= =?UTF-8?q?=E8=8E=B7=E5=8F=96cell=E6=94=B9=E4=B8=BA=E9=80=92=E5=BD=92,?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=88=A4=E6=96=AD=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecgframework/poi/util/PoiElUtil.java | 6 ++---- .../java/org/jeecgframework/poi/util/PoiMergeCellUtil.java | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java index 3ae480a..7a12652 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java @@ -25,6 +25,8 @@ import org.jeecgframework.poi.exception.excel.ExcelExportException; * @date 2015年4月25日 下午12:13:21 */ public final class PoiElUtil { + + public static final String LENGTH = "le:"; public static final String FOREACH = "fe:"; @@ -220,10 +222,6 @@ public final class PoiElUtil { .trim(); } - public static void main(String[] args) { - System.out.println(getKey(IF_DELETE, "测试 " + IF_DELETE + " (小明)")); - } - /** * 三目运算 * @return 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 a46f053..4e2661a 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 @@ -185,11 +185,10 @@ public final class PoiMergeCellUtil { * @return */ private static String getCellNotNullText(Cell cell, int index, int rowNum) { - String temp = cell.getRow().getCell(index).getStringCellValue(); - while (StringUtils.isEmpty(temp)) { - temp = cell.getRow().getSheet().getRow(--rowNum).getCell(index).getStringCellValue(); + if(cell.getRow().getCell(index) != null && StringUtils.isNotEmpty(cell.getRow().getCell(index).getStringCellValue())){ + return cell.getRow().getCell(index).getStringCellValue(); } - return temp; + return getCellNotNullText(cell.getRow().getSheet().getRow(--rowNum).getCell(index),index,rowNum); } }