From 2a61fc213ecdbf3b100e66909a30946af54fb772 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 5 Sep 2024 10:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/service/impl/TestReportManageServiceImpl.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java
index 55e0614..5be7d49 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java
@@ -616,8 +616,10 @@ public class TestReportManageServiceImpl implements TestReportManageService {
 	 * @param sheet  创建的sheet页
 	 */
 	public static void  addMergedRegion(int startRow,int endRow,int startCol,int endCol,Sheet sheet){
-		CellRangeAddress cra = new CellRangeAddress(startRow,endRow,startCol,endCol);
-		sheet.addMergedRegion(cra);
+		if(startCol!=endCol){
+			CellRangeAddress cra = new CellRangeAddress(startRow,endRow,startCol,endCol);
+			sheet.addMergedRegion(cra);
+		}
 	}
 
 	/**