From 2555f0b057fd65c0be1b72aabf541dafe81bd327 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Jun 2025 14:41:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91sql=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/dataset/manage/DatasetDataManage.java | 2 +- .../src/views/visualized/data/dataset/form/DatasetUnion.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index 9a302b43e8..463a9f7677 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -139,7 +139,7 @@ public class DatasetDataManage { } else { // parser sql params and replace default value String s = new String(Base64.getDecoder().decode(tableInfoDTO.getSql())); - String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), false, false, null, datasourceRequest.getIsCross(), datasourceRequest.getDsList(), pluginManage, getUserEntity()); + String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), true, false, null, datasourceRequest.getIsCross(), datasourceRequest.getDsList(), pluginManage, getUserEntity()); originSql = provider.replaceComment(originSql); // add sql table schema diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue index da178cb889..6d95dd7cdf 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue @@ -269,14 +269,15 @@ const closeSqlNode = () => { changeSqlId.value.length === 1 ) { currentNode.value = state.nodeList[0] - const { datasourceId, id, info, tableName } = currentNode.value + const { datasourceId, id, info, tableName, sqlVariableDetails } = currentNode.value getTableField({ datasourceId, id, info, tableName, type: 'sql', - isCross: isCross.value + isCross: isCross.value, + sqlVariableDetails: sqlVariableDetails }).then(res => { const idOriginNameMap = allfields.value.reduce((pre, next) => { pre[`${next.datasetTableId}${next.originName}`] = next.id