diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
index 26bfa16db29d77de8bc4046eb37a8574d49576c6..aeacd308995b3db5602b3ee5721001e92942e0bd 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 81a478b7ed40a24a54d81d3aa08197c1510a2ee4..bbde401a18d2a4f5e74a8d6ca14e445bdfad08f6 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);
+            }
         }