From dfec87ee3b5809b2884c869948972a38f50c9994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=86=E9=B9=8F?= Date: Fri, 9 Aug 2024 17:55:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2699):=20=E5=85=83=E7=B4=A0page?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9ElinkExt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tyr/server/controller/PrivateController.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/PrivateController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/PrivateController.java index 42a021de..923c58e1 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/PrivateController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/PrivateController.java @@ -714,7 +714,9 @@ public class PrivateController { List saasPageElements = saasPageElementDao.lambdaQuery() .eq(BaseEntity::getIsDelete, DeleteEnum.NORMAL.getValue()) .eq(SaasPageElement::getTerminal, TerminalInfo.NT_CMP_APP_GENERAL) - .ne(SaasPageElement::getLinkUrl, StringUtils.EMPTY) + .and(wrapper -> wrapper.ne(SaasPageElement::getLinkUrl, StringUtils.EMPTY) + .or() + .ne(SaasPageElement::getLinkExt, StringUtils.EMPTY)) .gt(BaseEntity::getId, startId) .orderByAsc(BaseEntity::getId) .last("LIMIT " + request.getPageSize()) @@ -739,13 +741,17 @@ public class PrivateController { continue; } SaasFeatureResource saasFeatureResource = saasFeatureResources.get(0); - if (!FeatureResourceType.APP_ENTRY.getCode().equals(saasFeatureResource.getFeatureType()) - || pageElement.getLinkUrl().equals(saasFeatureResource.getLinkUrl())) { + if (!FeatureResourceType.APP_ENTRY.getCode().equals(saasFeatureResource.getFeatureType())) { + continue; + } + if (pageElement.getLinkUrl().equals(saasFeatureResource.getLinkUrl()) + && pageElement.getLinkExt().equals(saasFeatureResource.getLinkExt())) { continue; } saasFeatureResourceDao.lambdaUpdate() .eq(BaseEntity::getId, saasFeatureResource.getId()) - .set(SaasFeatureResource::getLinkUrl, pageElement.getLinkUrl()) + .set(StringUtils.isNotBlank(pageElement.getLinkUrl()), SaasFeatureResource::getLinkUrl, pageElement.getLinkUrl()) + .set(StringUtils.isNotBlank(pageElement.getLinkExt()), SaasFeatureResource::getLinkExt, pageElement.getLinkExt()) .update(); log.info("refreshCmpFeatureResourceLinkUrl SaasFeatureResourceId:{}", saasFeatureResource.getId()); }