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 62c94bb2a0c5eb26521e24d5e020f6c11fdfda43..51672ed9721a9643178d06a66793dc7fd130d28b 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 apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode) { List ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType); - ArrayList 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 26d176f7846a28530d2cb77d00933668589b61fb..d256d087ab9b09985d547e9801f609ff8a1f58ee 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 groupDtos = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode); if (groupDtos.size() != 0) { - return groupDtos; + return groupDtos; } return Collections.EMPTY_LIST; }