From a1e955a2c6f49b7166fcd2a0013e4aa4eeeb28f7 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 14:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ApiBasicManagementServiceImpl.java    | 10 ++--------
 .../service/impl/TenantBasicManagementServiceImpl.java |  2 +-
 2 files changed, 3 insertions(+), 9 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 62c94bb..51672ed 100644
--- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
@@ -157,14 +157,8 @@ 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);
-        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;
+        if (ocpApiGroups.size() != 0) {
+            return ocpApiGroups;
         } else {
             if (StringUtils.isNotEmpty(apiCode)) {
                 return Collections.EMPTY_LIST;
diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
index 26d176f..d256d08 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -276,7 +276,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
             } else {
                 List<GroupDto> groupDtos = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode);
                 if (groupDtos.size() != 0) {
-                    return groupDtos;
+                     return groupDtos;
                 }
                 return Collections.EMPTY_LIST;
             }
-- 
2.26.0