From cc8e6c723bed93193f010d59df4781e7b4aec7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=86=E9=B9=8F?= Date: Sat, 14 Sep 2024 14:01:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2899):=E5=85=B3=E7=B3=BB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SaasPageElementServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java index 3f6eaa60..57d510e5 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java @@ -671,8 +671,18 @@ public class SaasPageElementServiceImpl extends ServiceImpl uniCodeRelationMap = relations.stream() - .collect(Collectors.toMap(SaasPageElementFeatureResourceRelation::getFeatureResourceUniCode, Function.identity(), (v1, v2) -> v1)); + Map uniCodeRelationMap = Maps.newHashMap(); + List pageRouteUniCodes = Lists.newArrayList(); + for(SaasPageElementFeatureResourceRelation relation : relations) { + if (pageRouteUniCodes.contains(relation.getFeatureResourceUniCode())) { + continue; + } + uniCodeRelationMap.put(relation.getFeatureResourceUniCode(), relation); + if (PageElementFeatureResourceRelationTypeEnum.PAGE_ROUTE.getValue().equals(relation.getType())) { + pageRouteUniCodes.add(relation.getFeatureResourceUniCode()); + } + } + List reps = allFeatureResources.stream().map(e -> PageElementRelationFeatureResourceResp.builder() .id(e.getId()) .parentId(e.getParentId())