Commit a1e955a2 authored by 郭凡凡's avatar 郭凡凡

修改

parent 4d2a06cc
...@@ -157,14 +157,8 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen ...@@ -157,14 +157,8 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
@Override @Override
public List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode) { public List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode) {
List<OcpGroupBaseDto> ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType); List<OcpGroupBaseDto> ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType);
ArrayList<OcpGroupBaseDto> list = new ArrayList<>(); if (ocpApiGroups.size() != 0) {
for (OcpGroupBaseDto ocpApiGroup : ocpApiGroups) { return ocpApiGroups;
if (StringUtils.isNotBlank(ocpApiGroup.getApiCode())&&StringUtils.isNotBlank(ocpApiGroup.getApiName())){
list.add(ocpApiGroup);
}
}
if (list.size() != 0) {
return list;
} else { } else {
if (StringUtils.isNotEmpty(apiCode)) { if (StringUtils.isNotEmpty(apiCode)) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
......
...@@ -276,7 +276,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -276,7 +276,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
} else { } else {
List<GroupDto> groupDtos = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode); List<GroupDto> groupDtos = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode);
if (groupDtos.size() != 0) { if (groupDtos.size() != 0) {
return groupDtos; return groupDtos;
} }
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