From 2b9d589b951d5b883c38284573dd545377081137 Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Fri, 25 Mar 2022 16:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pms/ocp/mapper/OcpApiTreeMapper.java |  2 +-
 .../ocp/service/impl/OcpApiTreeServiceImpl.java   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
index 26bfa16..aeacd30 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
@@ -41,5 +41,5 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
   OcpApiGroup selectCode(String code);
 
   //根据code查询是否含有下级服务
-    List<OcpApiGroup> selectGrpPcode();
+    List<OcpApiGroup> selectGroupPcode(String apiGroupCode);
 }
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 81a478b..bbde401 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
@@ -145,7 +145,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
         queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode());
         String objId = ocpApiGroup.getObjId();
 
-        List<OcpApiGroup> list = mapper.selectGrpPcode();
+        List<OcpApiGroup> list = mapper.selectGroupPcode(ocpApiGroup.getApiGroupCode());
         if (list.size() >= 1) {
             flag = false;
         }
@@ -185,9 +185,16 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
 
             }
         } else if (StringUtils.isNotBlank(pageGroupDto.getKeyword())) {
-            LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword()))
-                    .and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode()));
-            mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
+            if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
+                LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword()))
+                        .and(c->c.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()));
+                mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
+
+            }else if (StringUtils.isNotBlank(pageGroupDto.getApiGroupCode())) {
+                LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword()))
+                        .and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode()));
+                mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
+            }
         }
 
 
-- 
2.26.0