From 0e17c16ef0d62f144f82d9803b311ed37a1b103d Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Thu, 17 Mar 2022 15:38:54 +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 --- .../java/com/pms/ocp/mapper/OcpApiTreeMapper.java | 2 +- .../java/com/pms/ocp/model/dto/PageGroupDto.java | 6 +++--- .../ocp/service/impl/OcpApiTreeServiceImpl.java | 15 ++++++++------- .../pms/ocp/service/impl/TenantServiceImpl.java | 8 ++++---- src/main/resources/mapper/OcpApiTreeMapper.xml | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index a697c9e..02ad59a 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper { List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - List selectLists(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel); + List selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel); //code重复问题 List selectGroupCode(); diff --git a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java index de444dd..2395d25 100644 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -51,7 +51,7 @@ public class PageGroupDto extends PageParam { private long isDelete; @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") - private long apiGroupLevel; + private String apiGroupLevel; public String getObjId() { return objId; @@ -157,11 +157,11 @@ public class PageGroupDto extends PageParam { this.isDelete = isDelete; } - public long getApiGroupLevel() { + public String getApiGroupLevel() { return apiGroupLevel; } - public void setApiGroupLevel(long apiGroupLevel) { + public void setApiGroupLevel(String apiGroupLevel) { this.apiGroupLevel = apiGroupLevel; } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index aa2ff52..b83eb7d 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageInfo; import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; @@ -146,18 +147,18 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageSize(), pageGroupDto.getPageNum()); + Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ - List ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType()); - pageInfo.setRecords(ocpApiGroups); +// List ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType()); +// pageInfo.setRecords(ocpApiGroups); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()); - mapper.selectPage(pageInfo,lambdaQueryWrapper); + lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); + pageInfo = mapper.selectPage(pageInfo,lambdaQueryWrapper); }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); - LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); +// LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); pageInfo.setRecords(ocpApiGroups); - mapper.selectPage(pageInfo, lwq); + pageInfo = mapper.selectPage(pageInfo, null); } return pageInfo; } 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 c9bb5b2..89a138a 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -176,10 +176,10 @@ public class TenantServiceImpl extends ServiceImpl Page page = new Page<>(currentPage, pageSize); if (StringUtils.isBlank(keyword)) { if(lev.equals("1")) { - List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); - qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); - page.setRecords(ocpTenantGroupList); - tenantMapper.selectPage(page, qw); + // List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); + LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); +// page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page, eq); }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); diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index a8973bf..dac424d 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -15,7 +15,7 @@ -- 2.26.0