From f49464d69427841747287cb24b152ab5716d772f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 3 Jan 2023 11:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/report/util/WordUtil.java    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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 ae1d10b2e..55fe92bc8 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
@@ -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");