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 841a1e4ac11572857698390ebfd15d31db4393cf..26d176f7846a28530d2cb77d00933668589b61fb 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 tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode, String tenantCode) { List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); - if (ocpTenantGroups.size() != 0) { - return ocpTenantGroups; + List 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;