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..6bcb694aeced315595219c8c5fbd237496bc2a80 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -159,7 +159,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType); ArrayList list = new ArrayList<>(); for (OcpGroupBaseDto ocpApiGroup : ocpApiGroups) { - if (StringUtils.isNotBlank(ocpApiGroup.getApiCode())&&StringUtils.isNotBlank(ocpApiGroup.getApiName())){ + if (StringUtils.isNotBlank(ocpApiGroup.getApiGroupCode())&&StringUtils.isNotBlank(ocpApiGroup.getApiGroupName())){ list.add(ocpApiGroup); } } 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..ae9ed55365f11c57f3641ce09e6b9888beb45a89 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -264,7 +264,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); List list = new ArrayList<>(); for (GroupDto ocpTenantGroup : ocpTenantGroups) { - if (StringUtils.isNotBlank(ocpTenantGroup.getTenantCode())&&StringUtils.isNotBlank(ocpTenantGroup.getTenantName())){ + if (StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupCode())&&StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupName())){ list.add(ocpTenantGroup); } }