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 1b56973eb..206309fd3 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 @@ -1247,15 +1247,15 @@ public class WordUtil { for (String value : itemText.split(",")) { String blank = getBlank(value); - //contains()方法 当选中的是Mandatory if fitted时,Mandatory也包含在其中结果会是true,也会被选中 - if(text.equals("Mandatory if fitted") && value.equals("Mandatory if fitted")){ - sb.append("■"+value+blank); - break; - } if(text.contains(value)){ - //将错误的英文转为正确的 - String value1 = scopeConvert(value); - sb.append("■"+value1+blank); + if(text.equals("Mandatory if fitted") && value.equals("Mandatory")){ + sb.append("□"+value+blank); + }else { + //将错误的英文转为正确的 + String value1 = scopeConvert(value); + sb.append("■"+value1+blank); + } + }else{ String value1 = scopeConvert(value); sb.append("□"+value1+blank);