From 9013372b8727f6fda6d96c356136a48541f7f110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 16 Dec 2022 17:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=88=E6=8A=A5=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88Mandatory=20if=20fitted=E6=94=B9=E4=B8=BAif=20fitted?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/modules/report/util/WordUtil.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 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: