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

src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java

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