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

This commit is contained in:
RuoYi 2022-10-10 09:18:02 +08:00
parent eba25bcae2
commit 591717995c

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 (isSubListValue(vo)) if (isSubList())
{ {
subList = getListCellValue(vo); if (isSubListValue(vo))
subMergedLastRowNum = subMergedLastRowNum + subList.size(); {
subList = getListCellValue(vo);
subMergedLastRowNum = subMergedLastRowNum + subList.size();
}
else
{
subMergedFirstRowNum++;
subMergedLastRowNum++;
}
} }
int column = 0; int column = 0;
for (Object[] os : fields) for (Object[] os : fields)
{ {