diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index 7151e6a7fb04a0845ccf36d6789876be7491ca16..a5034a163577a725a95b2abdaf41af64b0def0f9 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -156,13 +156,13 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - if ("".equals(pageGroupDto.getKeyword())) { - if (StringUtils.isBlank(pageGroupDto.getApiGroupLevel())) { + if (StringUtils.isBlank(pageGroupDto.getKeyword())) { + if (StringUtils.isBlank(pageGroupDto.getApiGroupPcode())) { qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); mapper.selectPage(pageInfo, qw); - } else if ("Middleground".equals(pageGroupDto.getApiGroupLevel()) || "sys_center".equals(pageGroupDto.getApiGroupLevel()) || "api_group".equals(pageGroupDto.getApiGroupLevel())) { + } else{ List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); pageInfo.setRecords(ocpApiGroups); pageInfo.setTotal(ocpApiGroups.size()); diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index f634b451a490d31fa5cbaec93380c55bba587896..3551fea6f6e9faa4c1f50b4ce3514bd3f4079f91 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -15,7 +15,7 @@