diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index e8b639f50b2167ff9085e7256528f13410fdb220..650b2969fbe5fe0581a5c29b7cf59e94e09ccc0e 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -41,8 +41,8 @@ public class OcpTenantController { } @GetMapping("/tenantselect") @ApiModelProperty("应用树分类--查询") - private ResponseVO> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){ - Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword); + private ResponseVO> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword,String lev ){ + Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword,lev); return ResponseVO.ok(tree); } diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index 04ba99e3c5eeb599216f82a52a14cca98dda5294..fd1e814f83e94d2ff7b812e4fe7873f777a70221 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -48,6 +48,6 @@ public interface TenantService extends IService { * @param tenantGroupCompanyCode * @return */ - Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text); + Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev); } 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 c8891226fa6efb7335599f30629283f52013e1a0..884d7df7f41891d4df6d615e6ed1dc7d25b74ee7 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -168,18 +168,17 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public Page getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword) { + public Page getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); 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); - - } else if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) { + if(lev.equals("1")) { + List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); + qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); + page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page, qw); + }else if (lev.equals("2") || lev.equals("3")) { LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); tenantMapper.selectPage(page, eq); }