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

feat(REQ-2545): 分页查询组件接口返回参数修改

Browse Source
This commit is contained in:
李昆鹏 2024-06-28 09:46:36 +08:00
parent 052899e355
commit 561ed2de18
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java
View File

@ -46,7 +46,7 @@ public class PageElementResp {
/**
* 页面路由地址
*/
private String linkUr;
private String linkUrl;
/**
* 是否已勾选

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

@ -244,12 +244,15 @@ public class SaasPageElementServiceImpl implements SaasPageElementService {
if (CollectionUtils.isEmpty(relations)) {
continue;
}
SaasFeatureResource saasFeatureResource = saasFeatureResourceDao.lambdaQuery()
List<SaasFeatureResource> 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;
}