From 24ba34460dfe8e99cece75e9ffe247586817d2da Mon Sep 17 00:00:00 2001 From: shimingen Date: Fri, 28 Jun 2019 12:26:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=8E=B0null=E5=80=BC=E6=88=96?= =?UTF-8?q?=E8=80=85""=E7=9A=84=E5=A4=84=E7=90=86=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/afterturn/easypoi/word/parse/ParseWord07.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/word/parse/ParseWord07.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/word/parse/ParseWord07.java index 5ff3f67..64ad808 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/word/parse/ParseWord07.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/word/parse/ParseWord07.java @@ -27,10 +27,7 @@ import org.apache.poi.xwpf.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import static cn.afterturn.easypoi.util.PoiElUtil.*; @@ -86,7 +83,8 @@ public class ParseWord07 { text = text.replace(FOREACH_NOT_CREATE, EMPTY).replace(FOREACH_AND_SHIFT, EMPTY) .replace(FOREACH, EMPTY).replace(START_STR, EMPTY); String[] keys = text.replaceAll("\\s{1,}", " ").trim().split(" "); - return PoiPublicUtil.getParamsValue(keys[0], map); + Object result=PoiPublicUtil.getParamsValue(keys[0], map); + return Objects.nonNull(result)?result:new ArrayList>(0); } return null; } @@ -172,6 +170,8 @@ public class ParseWord07 { } } + + /** * 解析这个表格 *