From a96b4ef9f75b1c78c9c685e0e80c49406104e72d Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Wed, 16 Mar 2022 16:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B5=E5=91=88=E6=98=8E=20--=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=9C=8D=E5=8A=A1=E6=A0=91=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pms/ocp/service/impl/TenantServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index c889122..c866229 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -173,13 +173,13 @@ public class TenantServiceImpl extends ServiceImpl Page page = new Page<>(currentPage, pageSize); if (StringUtils.isBlank(keyword)) { - if (!("".equals(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { -// List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); - qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); -// page.setRecords(ocpTenantGroupList); - tenantMapper.selectPage(page, qw); + if (!("".equals(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { + List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); + qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); + page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page, qw); - } else if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) { + }else if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) { LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); tenantMapper.selectPage(page, eq); } -- 2.26.0