From bf3c6d5babd449e4e57cd1ed417ddaf1a0e34759 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 7 Sep 2023 17:06:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=B8=AD=E5=AD=98=E5=9C=A8=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=9A=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#5892?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/PanelAppTemplateService.java        | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
index 22559c6833..c0feaeb2b6 100644
--- a/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
+++ b/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
@@ -314,7 +314,8 @@ public class PanelAppTemplateService {
         for (ChartViewWithBLOBs chartView : chartViewsInfo) {
             String oldViewId = chartView.getId();
             // 替换datasetId
-            chartView.setTableId(datasetsRealMap.get(chartView.getTableId()));
+            String newTableId = datasetsRealMap.get(chartView.getTableId());
+            chartView.setTableId(StringUtils.isEmpty(newTableId) ? " " : newTableId);
             datasetsRealMap.forEach((k, v) -> {
                 chartView.setXAxis(chartView.getXAxis().replaceAll(k, v));
                 chartView.setXAxisExt(chartView.getXAxisExt().replaceAll(k, v));
@@ -423,12 +424,12 @@ public class PanelAppTemplateService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Map<String,String> applyLinkJumps(List<PanelLinkJump> linkJumps, Map<String, String> chartViewsRealMap, String newPanelId) {
-        Map<String,String> linkJumpIdMap = new HashMap<>();
-        if(!CollectionUtils.isEmpty(linkJumps)){
-            for(PanelLinkJump linkJump :linkJumps){
+    public Map<String, String> applyLinkJumps(List<PanelLinkJump> linkJumps, Map<String, String> chartViewsRealMap, String newPanelId) {
+        Map<String, String> linkJumpIdMap = new HashMap<>();
+        if (!CollectionUtils.isEmpty(linkJumps)) {
+            for (PanelLinkJump linkJump : linkJumps) {
                 String newLinkJumpId = UUIDUtil.getUUIDAsString();
-                linkJumpIdMap.put(linkJump.getId(),newLinkJumpId);
+                linkJumpIdMap.put(linkJump.getId(), newLinkJumpId);
                 linkJump.setId(newLinkJumpId);
                 linkJump.setSourcePanelId(newPanelId);
                 linkJump.setSourceViewId(chartViewsRealMap.get(linkJump.getSourceViewId()));
@@ -440,8 +441,8 @@ public class PanelAppTemplateService {
 
     @Transactional(rollbackFor = Exception.class)
     public void applyLinkJumpInfos(List<PanelLinkJumpInfo> linkJumpInfos, Map<String, String> linkJumpIdMap, Map<String, String> datasetFieldsRealMap) {
-        if(!CollectionUtils.isEmpty(linkJumpInfos)){
-            for(PanelLinkJumpInfo linkJumpInfo :linkJumpInfos){
+        if (!CollectionUtils.isEmpty(linkJumpInfos)) {
+            for (PanelLinkJumpInfo linkJumpInfo : linkJumpInfos) {
                 String newLinkJumpInfoId = UUIDUtil.getUUIDAsString();
                 linkJumpInfo.setId(newLinkJumpInfoId);
                 linkJumpInfo.setLinkJumpId(linkJumpIdMap.get(linkJumpInfo.getLinkJumpId()));
@@ -455,12 +456,12 @@ public class PanelAppTemplateService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Map<String,String> applyLinkages(List<PanelViewLinkage> linkages, Map<String, String> chartViewsRealMap, String newPanelId) {
-        Map<String,String> linkageIdMap = new HashMap<>();
-        if(!CollectionUtils.isEmpty(linkages)){
-            for(PanelViewLinkage linkage :linkages){
+    public Map<String, String> applyLinkages(List<PanelViewLinkage> linkages, Map<String, String> chartViewsRealMap, String newPanelId) {
+        Map<String, String> linkageIdMap = new HashMap<>();
+        if (!CollectionUtils.isEmpty(linkages)) {
+            for (PanelViewLinkage linkage : linkages) {
                 String newId = UUIDUtil.getUUIDAsString();
-                linkageIdMap.put(linkage.getId(),newId);
+                linkageIdMap.put(linkage.getId(), newId);
                 linkage.setId(newId);
                 linkage.setPanelId(newPanelId);
                 linkage.setSourceViewId(chartViewsRealMap.get(linkage.getSourceViewId()));
@@ -473,8 +474,8 @@ public class PanelAppTemplateService {
 
     @Transactional(rollbackFor = Exception.class)
     public void applyLinkageFields(List<PanelViewLinkageField> linkageFields, Map<String, String> linkageIdMap, Map<String, String> datasetFieldsRealMap) {
-        if(!CollectionUtils.isEmpty(linkageFields)){
-            for(PanelViewLinkageField linkageField :linkageFields){
+        if (!CollectionUtils.isEmpty(linkageFields)) {
+            for (PanelViewLinkageField linkageField : linkageFields) {
                 String newId = UUIDUtil.getUUIDAsString();
                 linkageField.setId(newId);
                 linkageField.setLinkageId(linkageIdMap.get(linkageField.getLinkageId()));