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 a40d189b..fe3cdc04 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 3fab6d59..ab291fd9 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 @@ -379,14 +379,9 @@ public class Report1Gener { }else { isNumberAscArray.add("false"); } - String file_name; - if(upfileModel.getFileName().contains("--")){ - file_name=upfileModel.getFileName().replaceAll("--+|---", "-"); - }else{ - file_name=upfileModel.getFileName(); - } - object.put("file_name", file_name); - String link = fileName + File.separator + file_name; + + object.put("file_name", upfileModel.getFileName()); + String link = fileName + File.separator + upfileModel.getFileName(); object.put("link", link); fileTable.add(object); fileIndex++; @@ -505,7 +500,7 @@ public class Report1Gener { String attrValue = obj.getString("value"); if(attrValue.contains("<")||attrValue.contains(">")||attrValue.contains("&")||attrValue.contains("'")||attrValue.contains("\"")) { //attrValue= attrValue.replaceAll("<", "<").replaceAll(">", ">").replaceAll("&", "&").replaceAll("'", "'").replaceAll("\"", """); - attrValue= attrValue.replaceAll("<", "小于").replaceAll(">", "").replaceAll("&", "&").replaceAll("'", "'").replaceAll("\"", """); + attrValue= attrValue.replaceAll("<", "小于").replaceAll("&", "&").replaceAll("'", "'").replaceAll("\"", """); }