From 89b83256352754cf72ae5db35949604ec66e55ef Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Wed, 23 Mar 2022 10:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1--=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java     | 6 +++---
 src/main/resources/mapper/OcpApiTreeMapper.xml              | 2 +-
 2 files changed, 4 insertions(+), 4 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 7151e6a..a5034a1 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<OcpApiTreeMapper, OcpApiG
     public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
         Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize());
         LambdaQueryWrapper<OcpApiGroup> 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<OcpApiGroup> 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 f634b45..3551fea 100644
--- a/src/main/resources/mapper/OcpApiTreeMapper.xml
+++ b/src/main/resources/mapper/OcpApiTreeMapper.xml
@@ -15,7 +15,7 @@
     </select>
 <!--服务树 -查询-->
     <select id="selectLists" resultType="com.pms.ocp.model.entity.OcpApiGroup">
- SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode};
+ SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupcode};
     </select>
 
 
-- 
2.26.0