From c542b7ac32793d0338c64e26614902cd2840e8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=9F=E6=9B=BE=E4=B8=BA=E4=BD=A0=E3=80=81=E5=83=8F?=
 =?UTF-8?q?=E8=B6=85=E4=BA=BA?= <1553592282@qq.com>
Date: Fri, 30 Sep 2022 23:06:10 +0000
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA=E6=97=B6?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=A9=BA=E5=AD=90=E5=88=97=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 也曾为你、像超人 <1553592282@qq.com>
---
 .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java  | 5 +++++
 1 file changed, 5 insertions(+)

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 da91d737..d6876412 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 @@ public class ExcelUtil<T>
                 subList = getListCellValue(vo);
                 subMergedLastRowNum = subMergedLastRowNum + subList.size();
             }
+            else
+            {
+                subMergedFirstRowNum++;
+                subMergedLastRowNum++;
+            }
 
             int column = 0;
             for (Object[] os : fields)