From 593ad60b5ad56214ec9e0817953483979bed6148 Mon Sep 17 00:00:00 2001 From: yueju Date: Sun, 3 Jan 2016 16:51:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=B5=E5=90=91=E5=90=88=E5=B9=B6=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E6=97=B6,=E4=BE=9D=E8=B5=96=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E5=8A=A0=E5=85=A5=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poi/util/PoiMergeCellUtil.java | 6 ++- pom.xml | 38 ++++++++++++++++++- 2 files changed, 40 insertions(+), 4 deletions(-) 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 4e2661a..4f627b3 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 @@ -166,8 +166,7 @@ public final class PoiMergeCellUtil { // 存在依赖关系 if (mergeEntity.getText().equals(text)) { for (int i = 0; i < delys.length; i++) { - if (!getCellNotNullText(cell, delys[i], rowNum).equals( - mergeEntity.getRelyList().get(i))) { + if (mergeEntity.getRelyList().get(i) ==null || !mergeEntity.getRelyList().get(i).equals(getCellNotNullText(cell, delys[i], rowNum))) { return false; } } @@ -185,6 +184,9 @@ public final class PoiMergeCellUtil { * @return */ private static String getCellNotNullText(Cell cell, int index, int rowNum) { + if(cell == null || cell.getRow() == null){ + return null; + } if(cell.getRow().getCell(index) != null && StringUtils.isNotEmpty(cell.getRow().getCell(index).getStringCellValue())){ return cell.getRow().getCell(index).getStringCellValue(); } diff --git a/pom.xml b/pom.xml index 64d8b89..1530211 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ provided true - + com.itextpdf @@ -150,7 +150,6 @@ com.itextpdf itext-asian 5.2.0 - true @@ -176,6 +175,27 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.5 + + ossrh + https://oss.sonatype.org/ + true + + + + org.apache.maven.plugins + maven-release-plugin + 2.5 + + true + false + release + deploy + + org.apache.maven.plugins maven-compiler-plugin @@ -186,6 +206,20 @@ UTF-8 + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + org.apache.maven.plugins maven-source-plugin