From 69082446dce431a1c7abf11cf22c2ced0726251f Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Thu, 17 Mar 2022 15:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=B5=E5=91=88=E6=98=8E=20--=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=9C=8D=E5=8A=A1=E6=A0=91=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java    | 7 -------
 src/main/resources/mapper/OcpApiTreeMapper.xml             | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

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 b83eb7d..e550b9b 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<OcpApiTreeMapper,OcpApiGr
     @Override
     public List<OcpApiGroup> getByGroup(Long apiGroupPromotionType,String apiGroupCode) {
 
-//        if (StringUtils.isBlank(apiGroupPromotionType) && StringUtils.isBlank(apiGroupCode)) {
-            // List<OcpApiGroup> ocpApiGroups = mapper.selectApiGroups();
-            // return ocpApiGroups;
-//       }else
             if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){
                 List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType);
                 return ocpApiGroups;
@@ -149,14 +145,11 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
 
         Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize());
         if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
-//            List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType());
-//            pageInfo.setRecords(ocpApiGroups);
             LambdaQueryWrapper<OcpApiGroup> lambdaQueryWrapper = new LambdaQueryWrapper();
              lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType());
            pageInfo =  mapper.selectPage(pageInfo,lambdaQueryWrapper);
         }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){
             List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel());
-//            LambdaQueryWrapper<OcpApiGroup> 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 f961d55..5af1723 100644
--- a/src/main/resources/mapper/OcpApiTreeMapper.xml
+++ b/src/main/resources/mapper/OcpApiTreeMapper.xml
@@ -7,7 +7,7 @@
     </select>
 <!--    一级树-->
     <select id="selectTwoApiGroups" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_level = 'api_group';
+       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_level = 'api_group' and api_group_pcode = '';
     </select>
 <!--二级-->
     <select id="selectThreeApiGroupsList" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-- 
2.26.0