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

2 years ago · 01c1505340
parent c2708f2ba4
commit 01c1505340
1 changed files with 11 additions and 4 deletions
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@ -567,12 +567,19 @@ public class ExcelUtil<T>
            // 得到导出对象.
            T vo = (T) list.get(i);
            Collection<?> subList = null;
-            if (isSubListValue(vo))
+            if (isSubList())
            {
-                subList = getListCellValue(vo);
-                subMergedLastRowNum = subMergedLastRowNum + subList.size();
+                if (isSubListValue(vo))
+                {
+                    subList = getListCellValue(vo);
+                    subMergedLastRowNum = subMergedLastRowNum + subList.size();
+                }
+                else
+                {
+                    subMergedFirstRowNum++;
+                    subMergedLastRowNum++;
+                }
            }
-
            int column = 0;
            for (Object[] os : fields)
            {