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

修复导出包含空子列表数据异常的问题

pull/416/head
RuoYi 2022-10-10 09:00:10 +08:00
parent c105f44eb9
commit 67f2ba2aa9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,12 +694,19 @@ public class ExcelUtil<T>
// 得到导出对象. // 得到导出对象.
T vo = (T) list.get(i); T vo = (T) list.get(i);
Collection<?> subList = null; Collection<?> subList = null;
if (isSubList())
{
if (isSubListValue(vo)) if (isSubListValue(vo))
{ {
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)
{ {