From 7494adeafc40abbce7094959e60a356663dfde9b Mon Sep 17 00:00:00 2001 From: luziyang Date: Wed, 24 Apr 2024 17:03:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E6=B3=A8=E8=A7=A3@ExcelDictFormat(r?= =?UTF-8?q?eadConverterExp=20=3D=20"0=3D=E6=9C=AA=E7=BA=B3=E7=AE=A1,1=3D?= =?UTF-8?q?=E5=B7=B2=E7=BA=B3=E7=AE=A1")=E6=97=B6,=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9A=84excel=E4=B8=AD=E7=9A=84options=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=A1=B9=E4=B8=BA=EF=BC=9A0=3D=E6=9C=AA=E7=BA=B3=E7=AE=A1,1=3D?= =?UTF-8?q?=E5=B7=B2=E7=BA=B3=E7=AE=A1=EF=BC=9B=E8=80=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=EF=BC=9A=E6=9C=AA=E7=BA=B3=E7=AE=A1=EF=BC=8C=E5=B7=B2=E7=BA=B3?= =?UTF-8?q?=E7=AE=A1=EF=BC=9B=E7=9A=84=E6=83=85=E5=86=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/excel/ExcelDownHandler.java | 6 +++++- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java b/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java index 09f038886..62f204c02 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java @@ -107,7 +107,11 @@ public class ExcelDownHandler implements SheetWriteHandler { options = new ArrayList<>(values); } else if (StrUtil.isNotBlank(converterExp)) { // 如果指定了确切的值，则直接解析确切的值 - options = StrUtil.split(converterExp, format.separator(), true, true); + List rawOptions = StrUtil.split(converterExp, format.separator(), true, true); + for (String s : rawOptions) { + List split = StrUtil.split(s, "=", true, true); + options.add(split.get(1)); + } } } else if (field.isAnnotationPresent(ExcelEnumFormat.class)) { // 否则如果指定了@ExcelEnumFormat，则使用枚举的逻辑 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 78cf0e72d..ca631cbd9 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 @@ -362,7 +362,7 @@ public class ExcelUtil { } } } else { - if (itemArray[1].equals(propertyValue)) { + if (propertyValue.contains(itemArray[1])) { return itemArray[0]; } }