From 4cc475c2877961e5db2f35df3dac4a9cc31b6fe1 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 15 May 2024 15:39:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=94=AF=E6=8C=81=E5=A4=8D=E6=9D=82?= =?UTF-8?q?=E7=9A=84=E4=B8=8E=E6=88=96=E6=9D=A1=E4=BB=B6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/chart/manage/ChartDataManage.java | 1 - .../src/main/java/io/dataease/chart/manage/ChartViewManege.java | 2 +- 2 files changed, 1 insertion(+), 2 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 308bc4940d..e66e1234ed 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 @@ -190,7 +190,6 @@ public class ChartDataManage { //将没有权限的列删掉 List dataeaseNames = columnPermissionFields.stream().map(DatasetTableFieldDTO::getDataeaseName).collect(Collectors.toList()); dataeaseNames.add("*"); -// fieldCustomFilter = fieldCustomFilter.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); extStack = extStack.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); extBubble = extBubble.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); drill = drill.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index b4b6427766..d1e6e049ec 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -252,7 +252,7 @@ public class ChartViewManege { dto.setCustomStyle(JsonUtil.parse(record.getCustomStyle(), Map.class)); dto.setSenior(JsonUtil.parse(record.getSenior(), Map.class)); dto.setDrillFields(JsonUtil.parseList(record.getDrillFields(), tokenType)); - dto.setCustomFilter(JsonUtil.parse(record.getCustomFilter(), FilterTreeObj.class)); + dto.setCustomFilter(JsonUtil.parseObject(record.getCustomFilter(), FilterTreeObj.class)); dto.setViewFields(JsonUtil.parseList(record.getViewFields(), tokenType)); return dto;