diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 24851db7c7..29938ca456 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -111,7 +111,7 @@ public class ChartDataManage { var dillAxis = new ArrayList(); - DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null); + DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null); if (table == null) { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds")); } @@ -643,7 +643,7 @@ public class ChartDataManage { List drill = new ArrayList<>(view.getDrillFields()); // 获取数据集,需校验权限 - DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null); + DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null); Map desensitizationList = new HashMap<>(); List rowPermissionsTree = permissionManage.getRowPermissionsTree(table.getId(), view.getChartExtRequest().getUser()); 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 ad2d6abe47..8c88efdf99 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 @@ -516,7 +516,7 @@ public class DatasetDataManage { if (field.getChartId() != null) { allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId())); } - DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.get(datasetGroupId, null); + DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.getDatasetGroupInfoDTO(datasetGroupId, null); Map sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, new ChartExtRequest()); String sql = (String) sqlMap.get("sql"); @@ -668,7 +668,7 @@ public class DatasetDataManage { if (field.getChartId() != null) { allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId())); } - datasetGroupInfoDTO = datasetGroupManage.get(datasetGroupId, null); + datasetGroupInfoDTO = datasetGroupManage.getDatasetGroupInfoDTO(datasetGroupId, null); sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, new ChartExtRequest()); String sql = (String) sqlMap.get("sql"); @@ -888,7 +888,7 @@ public class DatasetDataManage { if (field.getChartId() != null) { allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId())); } - DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.get(datasetGroupId, null); + DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.getDatasetGroupInfoDTO(datasetGroupId, null); Map sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, new ChartExtRequest()); String sql = (String) sqlMap.get("sql"); diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java index dd01b916aa..dbaf3bbf26 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java @@ -431,7 +431,7 @@ public class DatasetGroupManage { return dto; } - public DatasetGroupInfoDTO get(Long id, String type) throws Exception { + public DatasetGroupInfoDTO getDatasetGroupInfoDTO(Long id, String type) throws Exception { CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id); if (coreDatasetGroup == null) { return null; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java index 3d1bbaed9c..38a5ff9b91 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java @@ -212,7 +212,7 @@ public class DatasetTableFieldManage { } public Map> copilotFields(Long id) throws Exception { - DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.get(id, null); + DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.getDatasetGroupInfoDTO(id, null); Map sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, null); Map dsMap = (Map) sqlMap.get("dsMap"); boolean crossDs = Utils.isCrossDs(dsMap); diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java index 3eb2f52478..d886cb68da 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java @@ -77,7 +77,7 @@ public class DatasetTreeServer implements DatasetTreeApi { @Override public DatasetGroupInfoDTO get(Long id) throws Exception { - return datasetGroupManage.get(id, "preview"); + return datasetGroupManage.getDatasetGroupInfoDTO(id, "preview"); } @Override