Commit a96b4ef9 authored by zhaochengming's avatar zhaochengming

赵呈明 --应用服务树分类

parent 368af6ba
...@@ -174,12 +174,12 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> ...@@ -174,12 +174,12 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize); Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
if (StringUtils.isBlank(keyword)) { if (StringUtils.isBlank(keyword)) {
if (!("".equals(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { if (!("".equals(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) {
// List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode);
qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
// page.setRecords(ocpTenantGroupList); page.setRecords(ocpTenantGroupList);
tenantMapper.selectPage(page, qw); tenantMapper.selectPage(page, qw);
} else if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) { }else if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) {
LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
tenantMapper.selectPage(page, eq); tenantMapper.selectPage(page, eq);
} }
......
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