github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12349 from dataease/pr@dev-v2@fixexprot

Browse Source 
fix: 导出数据失败
This commit is contained in:
taojinlong 2024-09-20 17:05:33 +08:00 committed by GitHub
commit 0baaa490b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@ -111,7 +111,7 @@ public class ChartDataManage {
var dillAxis = new ArrayList<ChartViewFieldDTO>();
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<ChartViewFieldDTO> drill = new ArrayList<>(view.getDrillFields());
// 获取数据集,需校验权限
DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null);
DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null);
Map<String, ColumnPermissionItem> desensitizationList = new HashMap<>();
List<DataSetRowPermissionsTreeDTO> rowPermissionsTree = permissionManage.getRowPermissionsTree(table.getId(), view.getChartExtRequest().getUser());

6
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
View File

@ -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<String, Object> 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<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, new ChartExtRequest());
String sql = (String) sqlMap.get("sql");

2
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
View File

@ -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;

2
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
View File

@ -212,7 +212,7 @@ public class DatasetTableFieldManage {
}
public Map<String, List<DatasetTableFieldDTO>> copilotFields(Long id) throws Exception {
DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.get(id, null);
DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.getDatasetGroupInfoDTO(id, null);
Map<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, null);
Map<Long, DatasourceSchemaDTO> dsMap = (Map<Long, DatasourceSchemaDTO>) sqlMap.get("dsMap");
boolean crossDs = Utils.isCrossDs(dsMap);

2
core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java
View File

@ -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