center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 行权限构建

Browse Source
This commit is contained in:
junjie 2021-12-14 11:09:38 +08:00
parent 1d61309804
commit 9505e3101b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -21,6 +21,8 @@ import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.controller.request.dataset.DataSetTaskRequest;
import io.dataease.controller.request.datasource.DatasourceRequest;
import io.dataease.controller.response.DataSetDetail;
import io.dataease.dto.chart.ChartCustomFilterDTO;
import io.dataease.dto.chart.ChartCustomFilterItemDTO;
import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
import io.dataease.dto.dataset.*;
import io.dataease.dto.dataset.union.UnionDTO;
@ -471,15 +473,19 @@ public class DataSetTableService {
public List<ChartFieldCustomFilterDTO> getCustomFilters(List<DatasetTableField> fields, DatasetTable datasetTable) {
List<ChartFieldCustomFilterDTO> customFilter = new ArrayList<>();
rowPermissions(datasetTable.getId()).forEach(datasetRowPermissions -> {
List<ChartFieldCustomFilterDTO> lists = JSONObject.parseArray(datasetRowPermissions.getFilter(), ChartFieldCustomFilterDTO.class);
List<ChartCustomFilterItemDTO> lists = JSONObject.parseArray(datasetRowPermissions.getFilter(), ChartCustomFilterItemDTO.class);
ChartFieldCustomFilterDTO dto = new ChartFieldCustomFilterDTO();
DatasetTableField field = getFieldById(fields, datasetRowPermissions.getDatasetFieldId());
lists.forEach(chartCustomFilterDTO -> {
DatasetTableField field = getFieldById(fields, datasetRowPermissions.getDatasetFieldId());
if (field != null) {
chartCustomFilterDTO.setId(datasetRowPermissions.getDatasetFieldId());
chartCustomFilterDTO.setField(field);
}
chartCustomFilterDTO.setFieldId(field.getId());
});
customFilter.addAll(lists);
if (field != null) {
dto.setFilter(lists);
dto.setField(field);
dto.setId(field.getId());
dto.setLogic("and");
customFilter.add(dto);
}
});
return customFilter;
}