From b2d0115be2a9f93b324326e42bf4d34301a10652 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Oct 2024 10:00:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dview=E5=8A=A0=E8=BD=BD=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/chart/manage/ChartViewManege.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
index e91410ec5a..2cdc8d5578 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
@@ -335,9 +335,13 @@ public class ChartViewManege {
         record.setExtLabel(objectMapper.writeValueAsString(dto.getExtLabel()));
         record.setExtTooltip(objectMapper.writeValueAsString(dto.getExtTooltip()));
         record.setCustomAttr(objectMapper.writeValueAsString(dto.getCustomAttr()));
-        record.setCustomAttrMobile(objectMapper.writeValueAsString(dto.getCustomAttrMobile()));
+        if(dto.getCustomAttrMobile() != null){
+            record.setCustomAttrMobile(objectMapper.writeValueAsString(dto.getCustomAttrMobile()));
+        }
         record.setCustomStyle(objectMapper.writeValueAsString(dto.getCustomStyle()));
-        record.setCustomStyleMobile(objectMapper.writeValueAsString(dto.getCustomStyleMobile()));
+        if(dto.getCustomAttrMobile() != null) {
+            record.setCustomStyleMobile(objectMapper.writeValueAsString(dto.getCustomStyleMobile()));
+        }
         record.setSenior(objectMapper.writeValueAsString(dto.getSenior()));
         record.setDrillFields(objectMapper.writeValueAsString(dto.getDrillFields()));
         record.setCustomFilter(objectMapper.writeValueAsString(dto.getCustomFilter()));
@@ -365,9 +369,13 @@ public class ChartViewManege {
         dto.setExtLabel(JsonUtil.parseList(record.getExtLabel(), tokenType));
         dto.setExtTooltip(JsonUtil.parseList(record.getExtTooltip(), tokenType));
         dto.setCustomAttr(JsonUtil.parse(record.getCustomAttr(), Map.class));
-        dto.setCustomAttrMobile(JsonUtil.parse(record.getCustomAttrMobile(), Map.class));
+        if(record.getCustomAttrMobile() != null){
+            dto.setCustomAttrMobile(JsonUtil.parse(record.getCustomAttrMobile(), Map.class));
+        }
         dto.setCustomStyle(JsonUtil.parse(record.getCustomStyle(), Map.class));
-        dto.setCustomStyleMobile(JsonUtil.parse(record.getCustomStyleMobile(), Map.class));
+        if(record.getCustomStyleMobile() != null) {
+            dto.setCustomStyleMobile(JsonUtil.parse(record.getCustomStyleMobile(), Map.class));
+        }
         dto.setSenior(JsonUtil.parse(record.getSenior(), Map.class));
         dto.setDrillFields(JsonUtil.parseList(record.getDrillFields(), tokenType));
         dto.setCustomFilter(JsonUtil.parseObject(record.getCustomFilter(), FilterTreeObj.class));