From ead2d5c8c3fbc3361873cf1c1cfae1fdf9dbd669 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 26 Apr 2024 18:01:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A7=86=E5=9B=BE=E5=AF=BC=E5=87=BA=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC=E6=98=BE=E7=A4=BAnull=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/exportCenter/ExportCenterService.java | 4 ++--
 core/frontend/src/components/canvas/utils/utils.js            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java
index 2ba74cacf7..850fb46ba3 100644
--- a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java
+++ b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java
@@ -290,7 +290,7 @@ public class ExportCenterService {
                                 // with DataType
                                 if ((excelTypes[j].equals(DeTypeConstants.DE_INT) || excelTypes[j].equals(DeTypeConstants.DE_FLOAT)) && rowData[j] != null) {
                                     cell.setCellValue(Double.valueOf(rowData[j].toString()));
-                                } else {
+                                } else if(rowData[j] != null){
                                     cell.setCellValue(String.valueOf(rowData[j]));
                                 }
                             } catch (Exception e) {
@@ -496,7 +496,7 @@ public class ExportCenterService {
                                             // with DataType
                                             if ((excelTypes[j].equals(DeTypeConstants.DE_INT) || excelTypes[j].equals(DeTypeConstants.DE_FLOAT)) && StringUtils.isNotEmpty(cellValObj.toString())) {
                                                 cell.setCellValue(Double.valueOf(cellValObj.toString()));
-                                            } else {
+                                            } else if(cellValObj != null){
                                                 cell.setCellValue(cellValObj.toString());
                                             }
                                         } catch (Exception e) {
diff --git a/core/frontend/src/components/canvas/utils/utils.js b/core/frontend/src/components/canvas/utils/utils.js
index 8b4d60d147..768d00bb7e 100644
--- a/core/frontend/src/components/canvas/utils/utils.js
+++ b/core/frontend/src/components/canvas/utils/utils.js
@@ -469,7 +469,7 @@ export function getCacheTree(treeName) {
 }
 
 export function exportExcelDownload(chart, snapshot, width, height, loadingWrapper, downloadParams, callBack) {
-  if ((chart.render === 'echarts' || ['text', 'label'.includes(chart.type)]) && !(chart.data?.series?.length && chart.data?.series[0].data?.length)) {
+  if ((chart.render === 'echarts' || ['text', 'label'].includes(chart.type)) && !(chart.data?.series?.length && chart.data?.series[0].data?.length)) {
     callBack()
     return
   } else if ((chart.render === 'antv' && !['text', 'label'].includes(chart.type)) && !chart.data?.data?.length) {