Browse Source

!595 解决导出时包含空子列表数据异常的问题
Merge pull request !595 from 也曾为你、像超人/N/A

若依 2 years ago
parent
commit
186c04d90a

+ 5 - 0
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)