From c542b7ac32793d0338c64e26614902cd2840e8e1 Mon Sep 17 00:00:00 2001
From: 也曾为你、像超人 <1553592282@qq.com>
Date: 星期六, 01 十月 2022 07:06:10 +0800
Subject: [PATCH] 解决导出时包含空子列表数据异常的问题

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git 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
index da91d73..d687641 100644
--- 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 @@
                 subList = getListCellValue(vo);
                 subMergedLastRowNum = subMergedLastRowNum + subList.size();
             }
+            else
+            {
+                subMergedFirstRowNum++;
+                subMergedLastRowNum++;
+            }
 
             int column = 0;
             for (Object[] os : fields)

--
Gitblit v1.9.2