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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java

@@ -1271,21 +1271,21 @@ public class WordUtil {
             text = "Final";
         }
 
-
         for (String value : itemText.split(",")) {
             String blank = getBlank(value);
-            if (text.contains(value)) {
+            if(StringUtils.isNotEmpty(text)){
-                if (text.equals("if fitted") && value.equals("Mandatory")) {
+                int count = 0 ;
-                    sb.append("□" + value + blank);
+                for (String s : text.split(",")) {
-                } else {
+                    if(s.equals(value)){
-                    //将错误的英文转为正确的
+                        count ++;
-                    String value1 = scopeConvert(value);
+                    }
+                }
+                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");