diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 042b77c15..4f07c88f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -1241,7 +1241,7 @@ public class WordUtil { setBlank(text, run, sb, itemText); } if ("Usage".equals(fieldName)) { - String itemText = "Mandatory,Voluntary,Mandatory if fitted"; + String itemText = "Mandatory,Voluntary,if fitted"; setBlank(text, run, sb, itemText); } } @@ -1261,7 +1261,7 @@ public class WordUtil { text = "Voluntary"; } if (text.equals("installation is compliant")) { - text = "Mandatory if fitted"; + text = "if fitted"; } if (text.equals("Public Notice")) { @@ -1275,7 +1275,7 @@ public class WordUtil { for (String value : itemText.split(",")) { String blank = getBlank(value); if (text.contains(value)) { - if (text.equals("Mandatory if fitted") && value.equals("Mandatory")) { + if (text.equals("if fitted") && value.equals("Mandatory")) { sb.append("□" + value + blank); } else { //将错误的英文转为正确的 @@ -1386,7 +1386,7 @@ public class WordUtil { case "Voluntary": blank = "\r\n"; break; - case "Mandatory if fitted": + case "if fitted": blank = ""; break; default: