diff --git a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar index 880fc10e..89d0d1af 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar and b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar differ diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 76e0c97d..cfd60d49 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -64,6 +64,7 @@ public class Report1Gener { GenerLogExd log = new GenerLogExd(); //word换行符 private final String WRAPSTRING = ""; + private final String WRAPSTRING_TABLE = ""; public Report1Gener() { } @@ -460,8 +461,8 @@ public class Report1Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); - tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING_TABLE)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING_TABLE)); termTable.add(tmp); } } @@ -485,8 +486,8 @@ public class Report1Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); - tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING_TABLE)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING_TABLE)); organizationTable.add(tmp); } }