服务bug修改

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);
 }

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,10 +185,17 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
 
             }
         } else if (StringUtils.isNotBlank(pageGroupDto.getKeyword())) {
+            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);
             }
+        }
 
 
         return pageInfo;