diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiPublicUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiPublicUtil.java index 649ba65..f501267 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiPublicUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiPublicUtil.java @@ -361,12 +361,10 @@ public final class PoiPublicUtil { Map map) throws Exception { String params = ""; while (currentText.indexOf(START_STR) != -1) { - params = currentText.substring(currentText.indexOf(START_STR) + 2, - currentText.indexOf(END_STR)); + params = currentText.substring(currentText.indexOf(START_STR) + 2, currentText.indexOf(END_STR)); Object obj = PoiElUtil.eval(params.trim(), map); //判断图片或者是集合 - if (obj instanceof ImageEntity || obj instanceof List - || obj instanceof ExcelListEntity) { + if (obj instanceof ImageEntity || obj instanceof List || obj instanceof ExcelListEntity) { return obj; } else if (obj != null){ currentText = currentText.replace(START_STR + params + END_STR, obj.toString()); @@ -456,6 +454,8 @@ public final class PoiPublicUtil { currentRun.addBreak(); } currentRun.setText(tempArr[tempArr.length - 1], tempArr.length - 1); + }else{ + currentRun.setText("",0); } } 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 2491096..5ff3f67 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 @@ -120,8 +120,7 @@ public class ParseWord07 { * @author JueYue * 2013-11-16 */ - private void parseThisParagraph(XWPFParagraph paragraph, - Map map) throws Exception { + private void parseThisParagraph(XWPFParagraph paragraph, Map map) throws Exception { XWPFRun run; // 拿到的第一个run,用来set值,可以保存格式 XWPFRun currentRun = null;