From bb81106bfccb9be41698b7435d872179a5d7d739 Mon Sep 17 00:00:00 2001 From: SupperDogITCode <13203991+superdogitcode@user.noreply.gitee.com> Date: Mon, 20 May 2024 08:17:28 +0000 Subject: [PATCH] =?UTF-8?q?update=20ruoyi-common/src/main/java/com/ruoyi/c?= =?UTF-8?q?ommon/utils/poi/ExcelUtil.java.=20public=20static=20String=20co?= =?UTF-8?q?nvertByExp(String=20propertyValue,=20String=20converterExp,=20S?= =?UTF-8?q?tring=20separator)=20=E5=A4=A7=E4=BD=AC=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=98=AF=E4=B8=8D=E6=98=AF=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=9A=84=E5=A4=AA=E5=A4=8D=E6=9D=82=E4=BA=86=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SupperDogITCode <13203991+superdogitcode@user.noreply.gitee.com> --- .../com/ruoyi/common/utils/poi/ExcelUtil.java | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 8c339b54c..c38ba02e2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -1219,31 +1219,14 @@ public class ExcelUtil */ public static String convertByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); String[] convertSource = converterExp.split(","); - for (String item : convertSource) - { + for (String item : convertSource) { String[] itemArray = item.split("="); - if (StringUtils.containsAny(propertyValue, separator)) - { - for (String value : propertyValue.split(separator)) - { - if (itemArray[0].equals(value)) - { - propertyString.append(itemArray[1] + separator); - break; - } - } - } - else - { - if (itemArray[0].equals(propertyValue)) - { - return itemArray[1]; - } + if (itemArray[0].equals(propertyValue)) { + return itemArray[1]; } } - return StringUtils.stripEnd(propertyString.toString(), separator); + return propertyValue; } /**