From bc7d2ca7b9c75d3c181166343bf3cffcaeca3af7 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 11 Jun 2026 18:00:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=BC=8F=E6=B4=9E=E3=80=91Calc?= =?UTF-8?q?iteProvider.java=20SQL=E6=B3=A8=E5=85=A5=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/dataset/manage/DatasetDataManage.java | 8 ++++++-- .../io/dataease/datasource/server/DatasourceServer.java | 2 -- 2 files changed, 6 insertions(+), 4 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 12c5cf94d2..3b5d7490f8 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 @@ -106,9 +106,11 @@ public class DatasetDataManage { List tableFields = null; String type = datasetTableDTO.getType(); DatasetTableInfoDTO tableInfoDTO = JsonUtil.parseObject(datasetTableDTO.getInfo(), DatasetTableInfoDTO.class); - // check table name - datasetCacheManage.validateTable(datasetTableDTO.getDatasourceId(), tableInfoDTO.getTable()); if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB) || StringUtils.equalsIgnoreCase(type, DatasetTableType.SQL)) { + if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB)) { + // check table name + datasetCacheManage.validateTable(datasetTableDTO.getDatasourceId(), tableInfoDTO.getTable()); + } CoreDatasource coreDatasource = dataSourceManage.getCoreDatasource(datasetTableDTO.getDatasourceId()); DatasourceSchemaDTO datasourceSchemaDTO = new DatasourceSchemaDTO(); if (coreDatasource.getType().contains(DatasourceConfiguration.DatasourceType.Excel.name()) || coreDatasource.getType().contains(DatasourceConfiguration.DatasourceType.API.name())) { @@ -179,6 +181,8 @@ public class DatasetDataManage { datasourceRequest.setTable(datasetTableDTO.getTableName()); tableFields = provider.fetchTableField(datasourceRequest); } else { + // check table name + datasetCacheManage.validateTable(datasetTableDTO.getDatasourceId(), tableInfoDTO.getTable()); // excel,api CoreDatasource coreDatasource = engineManage.getDeEngine(); DatasourceSchemaDTO datasourceSchemaDTO = new DatasourceSchemaDTO(); 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 67b1261f0b..812cb47344 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 @@ -840,8 +840,6 @@ public class DatasourceServer implements DatasourceApi { public List getTableField(Map req) throws DEException { String tableName = req.get("tableName"); String datasourceId = req.get("datasourceId"); - // check table name - datasetCacheManage.validateTable(Long.valueOf(datasourceId), tableName); DatasetTableDTO datasetTableDTO = new DatasetTableDTO(); datasetTableDTO.setDatasourceId(Long.valueOf(datasourceId)); if (!getTables(datasetTableDTO).stream().map(DatasetTableDTO::getTableName).collect(Collectors.toList()).contains(tableName)) {