From 2bfc26a569693922911595419133e9a77814c17e Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Fri, 19 Jan 2024 09:04:07 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=A3=80=E4=BF=AE=E8=AE=A1=E5=88=92=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/access/service/impl/AccessPlanV4ServiceImpl.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java
index d168016..d7eaced 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java
@@ -509,6 +509,11 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{
                 HSSFCell header_row_cell_6 = detail_row.getCell(6);
                 header_row_cell_6.setCellValue(details.get(j).getContent());
             }
+            if(detail_size <= 1){
+                // 累计合并结束行号
+                row += detail_size;
+                continue;
+            }
             CellRangeAddress header_region_0 = new CellRangeAddress((short) row, (short) row + detail_size - 1, (short) 0, (short) 0);
             CellRangeAddress header_region_1 = new CellRangeAddress((short) row, (short) row + detail_size - 1, (short) 1, (short) 1);
             CellRangeAddress header_region_2 = new CellRangeAddress((short) row, (short) row + detail_size - 1, (short) 2, (short) 2);