From 7b2eddc895da1ab00b34cce1b18ce61c40814f34 Mon Sep 17 00:00:00 2001 From: yjq Date: Fri, 2 Dec 2022 09:42:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84-=E6=B3=95=E8=A7=84=E6=9C=88?= =?UTF-8?q?=E6=8A=A5-=E5=AF=BC=E5=87=BA=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8B=BE=E9=80=89=E7=9A=84=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/report/util/WordUtil.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 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);