From 3795e5866255b0158b3a058a00c45beb1cb93c29 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 30 Jul 2024 19:40:24 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B47=E6=9C=8830=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BlTeacherAnswerServiceImpl.java           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
index e389cb5..f3c04f3 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
@@ -472,8 +472,11 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
 //            wo2.changeTableFillColor(tableMerge.getTableIndex(), tableMerge.getEndRow()+1, tableMerge.getCol(), i % 2 == 0?"c5d5e9":"f6f8fc");
 //            i++;
 //        }
-        TableMerge tableMerge2 =allMergeList1.get(0);
-        wo2.addTableMerge(tableMerge2, (tableMerge2.getStartRow()+1) % 2 == 0?"c5d5e9":"f6f8fc");
+
+        if(!allMergeList1.isEmpty()) {
+            TableMerge tableMerge2 =allMergeList1.get(0);
+            wo2.addTableMerge(tableMerge2, (tableMerge2.getStartRow()+1) % 2 == 0?"c5d5e9":"f6f8fc");
+        }
 
         i = 0;
         for (TableMerge tableMerge : allMergeList2){