wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2899):pageV2接口调整。

Browse Source
This commit is contained in:
李昆鹏 2024-09-14 13:36:56 +08:00
parent f4b99c6209
commit a2069f8377
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
View File

@ -80,9 +80,9 @@ public class SaasPageElementServiceImpl extends ServiceImpl<SaasPageElementMappe
private final SaasPageElementFeatureResourceRelationDao saasPageElementFeatureResourceRelationDao;
private final SaasFeatureResourceDao saasFeatureResourceDao;
private final TyrSaasAuthService tyrSaasAuthService;
private final MqProducer mqProducer;
private final SaasPgroupPermissionRelationOperateLogService saasPgroupPermissionRelationOperateLogService;
private final UserProfileServiceApi userProfileServiceApi;
private final MqProducer mqProducer;
private final SaasFeatureResourceService saasFeatureResourceService;
private final SaasPageElementFeatureResourceRelationService saasPageElementFeatureResourceRelationService;
private final SaasPageElementCategoryDao saasPageElementCategoryDao;
@ -511,7 +511,7 @@ public class SaasPageElementServiceImpl extends ServiceImpl<SaasPageElementMappe
.in(CollectionUtils.isNotEmpty(request.getElementTypes()), SaasPageElement::getType, request.getElementTypes())
.and(StringUtils.isNotBlank(request.getPageElementCodeOrName()), w -> 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<SaasPageElementMappe
.eq(BaseEntity::getIsDelete, DeleteEnum.NORMAL.getValue())
.list();
}
}