mirror of
https://github.com/dataease/dataease.git
synced 2025-02-23 19:12:55 +08:00
feat(数据集): 数据集增加分组字段功能枚举值接口
Some checks are pending
Typos Check / Spell Check with Typos (push) Waiting to run
Some checks are pending
Typos Check / Spell Check with Typos (push) Waiting to run
This commit is contained in:
parent
5ae02353af
commit
53b0a9a89d
@ -563,11 +563,6 @@ public class DatasetDataManage {
|
||||
|
||||
// 获取allFields
|
||||
List<DatasetTableFieldDTO> fields = Collections.singletonList(field);
|
||||
Map<String, ColumnPermissionItem> desensitizationList = new HashMap<>();
|
||||
fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null);
|
||||
if (ObjectUtils.isEmpty(fields)) {
|
||||
DEException.throwException(Translator.get("i18n_no_column_permission"));
|
||||
}
|
||||
buildFieldName(sqlMap, fields);
|
||||
|
||||
List<String> dsList = new ArrayList<>();
|
||||
@ -576,12 +571,6 @@ public class DatasetDataManage {
|
||||
}
|
||||
boolean needOrder = Utils.isNeedOrder(dsList);
|
||||
|
||||
List<DataSetRowPermissionsTreeDTO> rowPermissionsTree = new ArrayList<>();
|
||||
TokenUserBO user = AuthUtils.getUser();
|
||||
if (user != null) {
|
||||
rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId());
|
||||
}
|
||||
|
||||
Provider provider;
|
||||
if (crossDs) {
|
||||
provider = ProviderFactory.getDefaultProvider();
|
||||
@ -596,7 +585,7 @@ public class DatasetDataManage {
|
||||
}
|
||||
|
||||
Field2SQLObj.field2sqlObj(sqlMeta, fields, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage);
|
||||
WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage);
|
||||
WhereTree2Str.transFilterTrees(sqlMeta, null, allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage);
|
||||
Order2SQLObj.getOrders(sqlMeta, datasetGroupInfoDTO.getSortFields(), allFields, crossDs, dsMap, Utils.getParams(allFields), null, pluginManage);
|
||||
String querySQL;
|
||||
querySQL = SQLProvider.createQuerySQL(sqlMeta, false, needOrder, !StringUtils.equalsIgnoreCase(dsType, "es"));
|
||||
@ -633,13 +622,7 @@ public class DatasetDataManage {
|
||||
tmpData.set(i, val);
|
||||
}
|
||||
}
|
||||
if (desensitizationList.keySet().contains(field.getDataeaseName())) {
|
||||
for (int i = 0; i < tmpData.size(); i++) {
|
||||
previewData.add(ChartDataBuild.desensitizationValue(desensitizationList.get(field.getDataeaseName()), tmpData.get(i)));
|
||||
}
|
||||
} else {
|
||||
previewData = tmpData;
|
||||
}
|
||||
previewData = tmpData;
|
||||
}
|
||||
}
|
||||
return previewData;
|
||||
|
Loading…
Reference in New Issue
Block a user