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 b83eb7de7396ba04237f7b551460644e7a2d685d..e550b9bfa69618cc190b968002f76eccd0a4ce48 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -45,10 +45,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getByGroup(Long apiGroupPromotionType,String apiGroupCode) { -// if (StringUtils.isBlank(apiGroupPromotionType) && StringUtils.isBlank(apiGroupCode)) { - // List ocpApiGroups = mapper.selectApiGroups(); - // return ocpApiGroups; -// }else if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){ List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); return ocpApiGroups; @@ -149,14 +145,11 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType()); -// pageInfo.setRecords(ocpApiGroups); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); pageInfo = mapper.selectPage(pageInfo,lambdaQueryWrapper); }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); -// LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); pageInfo.setRecords(ocpApiGroups); pageInfo = mapper.selectPage(pageInfo, null); } diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index f961d555e6116be7623b31953ecc9543a55791a5..5af1723b6b3c6c827a53b5f8436d4ae0d9b4e101 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -7,7 +7,7 @@