From 2830b36f93769131d432b19fdca67f66cc1a1786 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 29 Aug 2024 16:01:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=A8=A1=E6=9D=BF=E4=BD=BF=E7=94=A8=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E9=9B=86=E8=AE=A1=E7=AE=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/DataVisualizationServer.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 27461a0363..7fbda9ee6b 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -185,6 +185,7 @@ public class DataVisualizationServer implements DataVisualizationApi { List newDsGroupInfo = new ArrayList<>(); Map dsTableIdMap = new HashMap<>(); Map dsTableFieldsIdMap = new HashMap<>(); + List dsTableFieldsList = new ArrayList(); Map datasourceIdMap = new HashMap<>(); Map> dsTableNamesMap = new HashMap<>(); List newDatasourceId = new ArrayList<>(); @@ -273,10 +274,19 @@ public class DataVisualizationServer implements DataVisualizationApi { dsDsField.setDatasetTableId(dsTableIdMap.get(dsDsField.getDatasetTableId())); dsDsField.setDatasourceId(datasourceIdMap.get(dsDsField.getDatasourceId())); dsDsField.setId(newId); - coreDatasetTableFieldMapper.insert(dsDsField); + dsTableFieldsList.add(dsDsField); dsTableFieldsIdMap.put(oldId,newId); }); + // dsTableFields 中存在计算字段在OriginName中 也需要替换 + dsTableFieldsList.forEach(dsTableFields ->{ + dsTableFieldsIdMap.forEach((key,value) ->{ + dsTableFields.setOriginName(dsTableFields.getOriginName().replaceAll(key.toString(),value.toString())); + }); + coreDatasetTableFieldMapper.insert(dsTableFields); + }); + + // 持久化数据集 newDsGroupInfo.forEach(dsGroup ->{ dsTableIdMap.forEach((key,value) ->{