From e7126b31ade8d37f33b54820981dfec26b576ae9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Sun, 6 Apr 2025 20:19:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E3=80=91=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/chart/server/ChartDataServer.java    | 8 +++-----
 .../io/dataease/datasource/server/DatasourceServer.java   | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
index 3cd0e59853..d470fc1709 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
@@ -338,7 +338,7 @@ public class ChartDataServer implements ChartDataApi {
 
             Map<String, Object> customAttr = viewInfo.getCustomAttr();
             Map<String, Object> tableHeaderMap = (Map<String, Object>) customAttr.get("tableHeader");
-            if (Boolean.valueOf(tableHeaderMap.get("headerGroup").toString())) {
+            if (tableHeaderMap.get("headerGroup") != null && Boolean.valueOf(tableHeaderMap.get("headerGroup").toString())) {
                 tableHeader = JsonUtil.parseObject((String) JsonUtil.toJSONString(customAttr.get("tableHeader")), TableHeader.class);
                 for (TableHeader.ColumnInfo column : tableHeader.getHeaderGroupConfig().getColumns()) {
                     totalDepth = Math.max(totalDepth, getDepth(column, 1));
@@ -450,10 +450,8 @@ public class ChartDataServer implements ChartDataApi {
 
                         Cell cell = row.createCell(j);
                         if (i == 0) {// 头部
-                            if (tableHeader != null) {
-                                cell.setCellValue(cellValObj.toString());
-                                cell.setCellStyle(cellStyle);
-                            }
+                            cell.setCellValue(cellValObj.toString());
+                            cell.setCellStyle(cellStyle);
                             //设置列的宽度
                             detailsSheet.setColumnWidth(j, 255 * 20);
                         } else if (cellValObj != null) {
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
index a9d48af41b..e83cc9a931 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
@@ -62,6 +62,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1458,7 +1459,7 @@ public class DatasourceServer implements DatasourceApi {
             if (exception.getCause() == null) {
                 return exception.getMessage();
             }
-            if (exception instanceof DEException && !(exception.getCause() instanceof DEException)) {
+            if (exception instanceof DEException && (!(exception.getCause() instanceof DEException) && !(exception.getCause() instanceof InvocationTargetException))) {
                 return exception.getMessage();
             }
             exception = exception.getCause();