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 b403c212..39f8ea11 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 30d5dc6b..26ff967f 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 @@ -436,8 +436,8 @@ public class Report1Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); termTable.add(tmp); } } @@ -461,8 +461,8 @@ public class Report1Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); organizationTable.add(tmp); } } diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java index 3ca6f1c0..da6b407f 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java @@ -415,8 +415,8 @@ public class Report2Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); termTable.add(tmp); } } @@ -440,8 +440,8 @@ public class Report2Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); organizationTable.add(tmp); } } diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar index fb05383c..53908822 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar and b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 79438295..e8bee699 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -569,8 +569,8 @@ public class Report1Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); termTable.add(tmp); } } @@ -591,8 +591,8 @@ public class Report1Gener { String name = obj2.getString("name"); String desc = obj2.getString("desc"); JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); + tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING)); + tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING)); organizationTable.add(tmp); } }