From 74b61e1b64534c2814350aa34fbc064674d331e1 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 28 Jun 2024 18:25:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(XPack):=20=E4=BF=AE=E5=A4=8D=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E5=91=8A=E9=80=89=E6=8B=A9=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E6=97=B6=E6=9C=89=E5=A4=9A=E4=BD=99=E5=9B=BE=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/dao/ext/mapper/ExtChartViewMapper.java | 2 +- .../io/dataease/chart/manage/ChartViewManege.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java b/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java index b77aee6e59..b0db442ac7 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java +++ b/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java @@ -11,7 +11,7 @@ import java.util.List; public interface ExtChartViewMapper { @Select(""" - select id, scene_id as pid, title, type from core_chart_view where scene_id = #{resourceId} + select id, scene_id as pid, title, type from core_chart_view where type != 'VQuery' and scene_id = #{resourceId} """) List queryViewOption(@Param("resourceId") Long resourceId); } 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 e91621d1d4..0408db8c06 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 @@ -23,11 +23,14 @@ import io.dataease.i18n.Translator; import io.dataease.utils.BeanUtils; import io.dataease.utils.IDUtils; import io.dataease.utils.JsonUtil; +import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo; +import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; @@ -46,6 +49,9 @@ public class ChartViewManege { @Resource private PermissionManage permissionManage; + @Resource + private DataVisualizationInfoMapper visualizationInfoMapper; + @Resource private ExtChartViewMapper extChartViewMapper; @@ -319,6 +325,13 @@ public class ChartViewManege { } public List viewOption(Long resourceId) { - return extChartViewMapper.queryViewOption(resourceId); + List result = extChartViewMapper.queryViewOption(resourceId); + DataVisualizationInfo dvInfo = visualizationInfoMapper.selectById(resourceId); + if(dvInfo != null && !CollectionUtils.isEmpty(result)){ + String componentData = dvInfo.getComponentData(); + return result.stream().filter(item ->componentData.indexOf(String.valueOf(item.getId()))>0).toList(); + }else{ + return result; + } } }