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

Merge pull request !595 from 也曾为你、像超人/N/A
2022-10-10 01:20:41 +00:00 · 2022-10-10 01:20:41 +00:00 · 186c04d90a
commit 186c04d90a
parent 3607e008a3 c542b7ac32
1 changed files with 5 additions and 0 deletions
--- 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
@ -699,6 +699,11 @@ public class ExcelUtil<T>
                subList = getListCellValue(vo);
                subMergedLastRowNum = subMergedLastRowNum + subList.size();
            }
+            else
+            {
+                subMergedFirstRowNum++;
+                subMergedLastRowNum++;
+            }

            int column = 0;
            for (Object[] os : fields)