xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-19 01:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!595 解决导出时包含空子列表数据异常的问题

Browse Source 
Merge pull request !595 from 也曾为你、像超人/N/A
This commit is contained in:
若依 2022-10-10 01:20:41 +00:00 committed by Gitee
commit 186c04d90a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,6 +699,11 @@ public class ExcelUtil<T>
subList = getListCellValue(vo); subList = getListCellValue(vo);
subMergedLastRowNum = subMergedLastRowNum + subList.size(); subMergedLastRowNum = subMergedLastRowNum + subList.size();
} }
else
{
subMergedFirstRowNum++;
subMergedLastRowNum++;
}
int column = 0; int column = 0;
for (Object[] os : fields) for (Object[] os : fields)