From a72f2622268164904a9a88e1be49c704555a8d70 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 1 Mar 2022 12:42:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=B9=B6=E8=A1=8C=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 2 +- .../io/dataease/service/dataset/DataSetTableService.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 828c206dc3..354758577e 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -264,7 +264,7 @@ public class ChartViewService { //行权限 - List rowPermissionFields = permissionService.getCustomFilters(columnPermissionFields, table, requestList.getUser()); + List rowPermissionFields = permissionService.getCustomFilters(fields, table, requestList.getUser()); fieldCustomFilter.addAll(rowPermissionFields); for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) { diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 4d95d8f4bf..2bb39fd550 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -479,6 +479,8 @@ public class DataSetTableService { return map; } DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(dataSetTableRequest.getId()); + // 行权限 + List customFilter = permissionService.getCustomFilters(fields, datasetTable, null); // 列权限 List desensitizationList = new ArrayList<>(); fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), null); @@ -488,8 +490,7 @@ public class DataSetTableService { map.put("page", new DataSetPreviewPage()); return map; } - // 行权限 - List customFilter = permissionService.getCustomFilters(fields, datasetTable, null); + String[] fieldArray = fields.stream().map(DatasetTableField::getDataeaseName).toArray(String[]::new); DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class);