diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java index 311b7c28..c32c9411 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java @@ -46,7 +46,7 @@ public class PageElementResp { /** * 页面路由地址 */ - private String linkUr; + private String linkUrl; /** * 是否已勾选 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 15be684d..b976594f 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 @@ -244,12 +244,15 @@ public class SaasPageElementServiceImpl implements SaasPageElementService { if (CollectionUtils.isEmpty(relations)) { continue; } - SaasFeatureResource saasFeatureResource = saasFeatureResourceDao.lambdaQuery() + List saasFeatureResources = saasFeatureResourceDao.lambdaQuery() .eq(SaasFeatureResource::getUniCode, relations.get(0).getFeatureResourceUniCode()) .eq(SaasFeatureResource::getTerminal, request.getTerminal()) - .one(); - if (Objects.isNull(saasFeatureResource) - || !FeatureResourceType.PAGE.getCode().equals(saasFeatureResource.getFeatureType()) + .list(); + if (CollectionUtils.isEmpty(saasFeatureResources)) { + continue; + } + SaasFeatureResource saasFeatureResource = saasFeatureResources.get(0); + if (!FeatureResourceType.PAGE.getCode().equals(saasFeatureResource.getFeatureType()) || pageElement.getLinkUrl().equals(saasFeatureResource.getLinkUrl())) { continue; }