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); }