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]; } }