From a71cb820bd2fbbbbfe4142a4c5c5c403f235593a Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 8 Dec 2025 16:49:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E9=87=8D=E5=90=8D=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/manage/DatasetSQLManage.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java index 24de2c7264..6f6e1a93f1 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java @@ -6,6 +6,7 @@ import io.dataease.api.permissions.dataset.api.RowPermissionsApi; import io.dataease.api.permissions.user.vo.UserFormVO; import io.dataease.commons.utils.SqlparserUtils; import io.dataease.constant.AuthEnum; +import io.dataease.constant.SQLConstants; import io.dataease.dataset.constant.DatasetTableType; import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup; import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper; @@ -17,7 +18,6 @@ import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; import io.dataease.datasource.manage.DataSourceManage; import io.dataease.datasource.manage.EngineManage; import io.dataease.engine.constant.ExtFieldConstant; -import io.dataease.constant.SQLConstants; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.api.PluginManageApi; import io.dataease.extensions.datasource.dto.DatasetTableDTO; @@ -162,12 +162,8 @@ public class DatasetSQLManage { String[] array = fields.stream() .map(f -> { - String alias; - if (StringUtils.isEmpty(f.getDataeaseName())) { - alias = TableUtils.fieldNameShort(table.getTableAlias() + "_" + f.getOriginName()); - } else { - alias = f.getDataeaseName(); - } + String alias = TableUtils.fieldNameShort(table.getTableAlias() + "_" + f.getOriginName()); + f.setFieldShortName(alias); f.setDataeaseName(f.getFieldShortName()); f.setDatasetTableId(datasetTable.getId()); @@ -336,12 +332,7 @@ public class DatasetSQLManage { String[] array = fields.stream() .map(f -> { - String alias; - if (StringUtils.isEmpty(f.getDataeaseName())) { - alias = TableUtils.fieldNameShort(table.getTableAlias() + "_" + f.getOriginName()); - } else { - alias = f.getDataeaseName(); - } + String alias = TableUtils.fieldNameShort(table.getTableAlias() + "_" + f.getOriginName()); f.setFieldShortName(alias); f.setDataeaseName(f.getFieldShortName()); @@ -497,6 +488,7 @@ public class DatasetSQLManage { public String putObj2Map(Map dsMap, DatasetTableDTO ds, boolean isCross) { return putObj2Map(dsMap, ds, isCross, null); } + public String putObj2Map(Map dsMap, DatasetTableDTO ds, boolean isCross, CoreDatasource coreDatasource) { // 通过datasource id校验数据源权限 if (ObjectUtils.isEmpty(coreDatasource)) {