From a0205c2cc3987f2b6ae760949ba5deeff54a02b1 Mon Sep 17 00:00:00 2001 From: xxxxxwwwww <3040838740@qq.com> Date: Thu, 31 Mar 2022 14:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java | 2 +- .../pms/ocp/service/impl/TenantBasicManagementServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 62c94bb..6bcb694 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 26d176f..ae9ed55 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); } } -- 2.26.0