diff --git a/mallinkService/src/main/java/com/iformall/print/PrintComponentHandler.java b/mallinkService/src/main/java/com/iformall/print/PrintComponentHandler.java index 25da36645..6695af9da 100644 --- a/mallinkService/src/main/java/com/iformall/print/PrintComponentHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/PrintComponentHandler.java @@ -31,8 +31,8 @@ public class PrintComponentHandler implements Serializable { } public static Object parseComponent(WxFinancePrintData data) { - JSONObject dataJson = JSON.parseObject(data.getPrintDataJson()); if("braid-txt".equals(data.getPrintDataType())) { + JSONObject dataJson = JSON.parseObject(data.getPrintDataJson()); PrintBraidTxt txt = new PrintBraidTxt(); txt.setTitle(data.getName()); txt.setIsEdit(data.getIsEdit()); @@ -41,6 +41,7 @@ public class PrintComponentHandler implements Serializable { txt.setDefaultValue(txt.getTitle()); return txt; }else if ("braid-table".equals(data.getPrintDataType())) { + JSONObject dataJson = JSON.parseObject(data.getPrintDataJson()); PrintBraidTable table = new PrintBraidTable(); table.setTitle(data.getName()); table.setIsEdit(data.getIsEdit()); @@ -78,14 +79,14 @@ public class PrintComponentHandler implements Serializable { PrintHtml html = new PrintHtml(); html.setTitle(data.getName()); html.setIsEdit(data.getIsEdit()); - html.setValue(dataJson.getString("html")); + html.setValue(data.getPrintDataJson()); html.setDefaultValue(data.getDefaultValue()); return html; }else if ("braid-html-table".equals(data.getPrintDataType())) { PrintHtml html = new PrintHtml(); html.setTitle(data.getName()); html.setIsEdit(data.getIsEdit()); - html.setValue(dataJson.getString("html")); + html.setValue(data.getPrintDataJson()); html.setIsFmCustomizedTable(EnumYesOrNo.YES.getCode()); html.setDefaultValue(data.getDefaultValue()); return html;