From 037e92ccccc88c9caa5f822004b246eb6dc80bc4 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 10:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E9=83=A8-=E5=BA=94=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=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/TenantBasicManagementServiceImpl.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 841a1e4..26d176f 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -262,8 +262,14 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     @Override
     public List<GroupDto> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode, String tenantCode) {
         List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
-        if (ocpTenantGroups.size() != 0) {
-            return ocpTenantGroups;
+        List<GroupDto> list = new ArrayList<>();
+        for (GroupDto ocpTenantGroup : ocpTenantGroups) {
+            if (StringUtils.isNotBlank(ocpTenantGroup.getTenantCode())&&StringUtils.isNotBlank(ocpTenantGroup.getTenantName())){
+                list.add(ocpTenantGroup);
+            }
+        }
+        if (list.size() != 0) {
+            return list;
         } else {
             if (StringUtils.isNotEmpty(tenantCode)) {
                 return Collections.EMPTY_LIST;
-- 
2.26.0