From 4d2a06cc7981062489f7e0270d7f0d36988abae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= <hello@itcast.cn>
Date: Thu, 31 Mar 2022 11:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E9=83=A8-=E6=9C=8D=E5=8A=A1=E5=BA=93-?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8-=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=91bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ApiBasicManagementServiceImpl.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
index 51672ed..62c94bb 100644
--- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
@@ -157,8 +157,14 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
     @Override
     public List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode) {
         List<OcpGroupBaseDto> ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType);
-        if (ocpApiGroups.size() != 0) {
-            return ocpApiGroups;
+        ArrayList<OcpGroupBaseDto> list = new ArrayList<>();
+        for (OcpGroupBaseDto ocpApiGroup : ocpApiGroups) {
+            if (StringUtils.isNotBlank(ocpApiGroup.getApiCode())&&StringUtils.isNotBlank(ocpApiGroup.getApiName())){
+                list.add(ocpApiGroup);
+            }
+        }
+        if (list.size() != 0) {
+            return list;
         } else {
             if (StringUtils.isNotEmpty(apiCode)) {
                 return Collections.EMPTY_LIST;
-- 
2.26.0