From 6633efd536da234220cd235e70f7409eba0e75be Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Mon, 1 Jul 2024 22:07:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E8=84=B1=E6=95=8F=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/manage/ChartDataManage.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 028b1e7a43..310d17870f 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 @@ -104,10 +104,6 @@ public class ChartDataManage { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_chart_not_handler") + ": " + view.getRender() + "," + view.getType()); } - AxisFormatResult formatResult = chartHandler.formatAxis(view); - var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis); - var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis); - DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null); if (table == null) { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds")); @@ -122,7 +118,6 @@ public class ChartDataManage { } List allFields = getAllChartFields(view); - formatResult.getContext().put("allFields", allFields); // column permission Map desensitizationList = new HashMap<>(); List columnPermissionFields = permissionManage.filterColumnPermissions(transFields(allFields), desensitizationList, table.getId(), chartExtRequest.getUser()); @@ -130,13 +125,18 @@ public class ChartDataManage { List rowPermissionsTree = permissionManage.getRowPermissionsTree(table.getId(), chartExtRequest.getUser()); //将没有权限的列删掉 List dataeaseNames = columnPermissionFields.stream().map(DatasetTableFieldDTO::getDataeaseName).collect(Collectors.toList()); - dataeaseNames.add("*"); + + AxisFormatResult formatResult = chartHandler.formatAxis(view); + formatResult.getContext().put("desensitizationList", desensitizationList); + var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis); + var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis); + formatResult.getContext().put("allFields", allFields); var axisMap = formatResult.getAxisMap(); axisMap.forEach((axis, fields) -> { Iterator iterator = fields.iterator(); while (iterator.hasNext()) { ChartViewFieldDTO fieldDTO = iterator.next(); - if (desensitizationList.containsKey(fieldDTO.getDataeaseName()) || !dataeaseNames.contains(fieldDTO.getDataeaseName())) { + if (!dataeaseNames.contains(fieldDTO.getDataeaseName())) { iterator.remove(); } } @@ -356,7 +356,6 @@ public class ChartDataManage { filterResult.getContext().put("querySql", querySql); } ChartCalcDataResult calcResult = chartHandler.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, calciteProvider); - formatResult.getContext().put("desensitizationList", desensitizationList); return chartHandler.buildChart(view, calcResult, formatResult, filterResult); }