Commit 037e92cc authored by 郭凡凡's avatar 郭凡凡

总部-应用列表树bug修复

parent fcfa07f4
...@@ -262,8 +262,14 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -262,8 +262,14 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
@Override @Override
public List<GroupDto> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode, String tenantCode) { public List<GroupDto> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode, String tenantCode) {
List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
if (ocpTenantGroups.size() != 0) { List<GroupDto> list = new ArrayList<>();
return ocpTenantGroups; for (GroupDto ocpTenantGroup : ocpTenantGroups) {
if (StringUtils.isNotBlank(ocpTenantGroup.getTenantCode())&&StringUtils.isNotBlank(ocpTenantGroup.getTenantName())){
list.add(ocpTenantGroup);
}
}
if (list.size() != 0) {
return list;
} else { } else {
if (StringUtils.isNotEmpty(tenantCode)) { if (StringUtils.isNotEmpty(tenantCode)) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment