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 b878eb24..3f6eaa60 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 @@ -80,9 +80,9 @@ public class SaasPageElementServiceImpl extends ServiceImpl w.like(SaasPageElement::getCode, request.getPageElementCodeOrName()) .or().like(SaasPageElement::getName, request.getPageElementCodeOrName())) -// .eq(StringUtils.isNotBlank(request.getPageElementGroupCodeOrName()), SaasPageElement::getType, PageElementTypeEnum.PAGE.getCode()) + .eq(StringUtils.isNotBlank(request.getPageElementGroupCodeOrName()), SaasPageElement::getType, PageElementTypeEnum.PAGE.getCode()) .and(StringUtils.isNotBlank(request.getPageElementGroupCodeOrName()), w -> w.like(SaasPageElement::getGroupCode, request.getPageElementGroupCodeOrName()) .or().like(SaasPageElement::getName, request.getPageElementGroupCodeOrName())) @@ -870,4 +870,5 @@ public class SaasPageElementServiceImpl extends ServiceImpl