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 863f3061db..24851db7c7 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.getDatasetGroupInfoDTO(view.getTableId(), null); + DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null); if (table == null) { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds")); } @@ -238,12 +238,12 @@ public class ChartDataManage { if (ObjectUtils.isNotEmpty(filters)) { for (ChartExtFilterDTO request : filters) { // 包含 DE 的为数据集参数 - if(request.getFieldId().contains("DE")){ + if (request.getFieldId().contains("DE")) { // 组装sql 参数原始数据 if (CollectionUtils.isNotEmpty(sqlVariables)) { - for(SqlVariableDetails sourceVariables : sqlVariables){ - if(sourceVariables.getId().equals(request.getFieldId())){ - if(CollectionUtils.isEmpty(request.getParameters())){ + for (SqlVariableDetails sourceVariables : sqlVariables) { + if (sourceVariables.getId().equals(request.getFieldId())) { + if (CollectionUtils.isEmpty(request.getParameters())) { request.setParameters(new ArrayList<>()); } request.getParameters().add(sourceVariables); @@ -251,7 +251,7 @@ public class ChartDataManage { } } - }else { + } else { DatasetTableFieldDTO datasetTableField = datasetTableFieldManage.selectById(Long.valueOf(request.getFieldId())); request.setDatasetTableField(datasetTableField); request.setFilterType(2); 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 d7cec6ff26..6c823bd6ac 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 @@ -45,8 +45,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; -import static io.dataease.result.ResultCode.DV_RESOURCE_UNCHECKED; - /** * @Author Junjun */ @@ -397,10 +395,6 @@ public class DatasetGroupManage { return dto; } - public DatasetGroupInfoDTO getDatasetGroupInfoDTO(Long id, String type) throws Exception { - return get(id, type); - } - public DatasetGroupInfoDTO getDetail(Long id) throws Exception { CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id); if (coreDatasetGroup == null) {