Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

2023-01-03 11:46:34 +08:00
parent b438729c55 f49464d694
commit cdc327755c
1 changed files with 11 additions and 11 deletions
@@ -1271,21 +1271,21 @@ public class WordUtil {
            text = "Final";
        }

-
        for (String value : itemText.split(",")) {
            String blank = getBlank(value);
-            if (text.contains(value)) {
-                if (text.equals("if fitted") && value.equals("Mandatory")) {
-                    sb.append("□" + value + blank);
-                } else {
-                    //将错误的英文转为正确的
-                    String value1 = scopeConvert(value);
+            if(StringUtils.isNotEmpty(text)){
+                int count = 0 ;
+                for (String s : text.split(",")) {
+                    if(s.equals(value)){
+                        count ++;
+                    }
+                }
+                String value1 = scopeConvert(value);
+                if(count == 0){
+                    sb.append("□" + value1 + blank);
+                }else{
                    sb.append("■" + value1 + blank);
                }
-
-            } else {
-                String value1 = scopeConvert(value);
-                sb.append("□" + value1 + blank);
            }
        }
        String[] split = sb.toString().split("\r\n");