From 2e6b53223514ca3bd5dea19a6e6ce3f2c44200f2 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 16 Apr 2025 14:51:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E8=B7=A8=E6=BA=90=E5=88=A4=E5=AE=9A=E9=80=BB=E8=BE=91=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/dataset/manage/DatasetDataManage.java | 2 +- .../java/io/dataease/datasource/server/DatasourceServer.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 a838d2e7db..c44e3d0e9a 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 @@ -326,7 +326,7 @@ public class DatasetDataManage { for (Map.Entry next : dsMap.entrySet()) { dsList.add(next.getValue().getType()); } - boolean crossDs = Utils.isCrossDs(dsMap); + boolean crossDs = datasetGroupInfoDTO.getIsCross(); if (!crossDs) { if (notFullDs.contains(dsMap.entrySet().iterator().next().getValue().getType()) && (boolean) sqlMap.get("isFullJoin")) { DEException.throwException(Translator.get("i18n_not_full")); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index e83cc9a931..b51a9a8a0f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -1094,6 +1094,7 @@ public class DatasourceServer implements DatasourceApi { PreviewSqlDTO previewSqlDTO = new PreviewSqlDTO(); previewSqlDTO.setSql(sql); previewSqlDTO.setDatasourceId(id); + previewSqlDTO.setIsCross(false); return datasetDataManage.previewSql(previewSqlDTO); }