BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !988 from 程子/N/A

pull/988/MERGE
程子 2025-12-03 02:26:55 +00:00 committed by Gitee
parent ad280e824c 3d0f0c9aae
commit f347084f04
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -1353,7 +1353,7 @@ public class ExcelUtil<T>
{
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;
@ -1362,7 +1362,7 @@ public class ExcelUtil<T>
}
else
{
if (itemArray[1].equals(propertyValue))
if (itemArray[1].equals(propertyValue) || itemArray[0].equals(propertyValue))
{
return itemArray[0];
}