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 9191c7a1285b8ac2b50ea43628acc12b1188d406..df2ee333806edfe6024366578e7a5e1ee778434a 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 @@ -1332,7 +1332,7 @@ public class ExcelUtil { for (String value : propertyValue.split(separator)) { - if (itemArray[1].equals(value)) + if (itemArray[1].equals(value) || itemArray[0].equals(value)) { propertyString.append(itemArray[0] + separator); break; @@ -1341,7 +1341,7 @@ public class ExcelUtil } else { - if (itemArray[1].equals(propertyValue)) + if (itemArray[1].equals(propertyValue) || itemArray[0].equals(propertyValue)) { return itemArray[0]; }