diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index 410986b14b816f46ff8b7c25eec8e89cd39a29cc..7129898917805848e2623a6f0912c5ecf2a44a2e 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -4,12 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.model.vo.ResponseVO; import java.util.List; -import java.util.Set; /** @@ -52,7 +49,7 @@ public interface TenantService extends IService { * @param tenantGroupCompanyCode * @return */ - Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev); + 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/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index e580bf8ada44d03d4d65019af1cb32a1db524abe..ebcdeedabedbe67dc4b1f5d7d65642c34b37f97b 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -168,12 +168,12 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); pageInfo.setRecords(ocpApiGroups); - pageInfo.setTotal(ocpApiGroups.size()); + pageInfo.setTotal(ocpApiGroups.size()); + } } else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){ LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) - .or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword()) - .or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword()); + .and(c->c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } 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 ffd58caee19ddf68eb3032b00ee7452ea261aba0..68648c2da274a117dad8b0831c723ea73a07bc0b 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -1,22 +1,18 @@ package com.pms.ocp.service.impl; -import cn.afterturn.easypoi.cache.manager.IFileLoader; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -190,9 +186,7 @@ public class TenantServiceImpl extends ServiceImpl tenantGroup.setClassIfy(ocpTenantGroup1.getTenantGroupName()); } // LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); - page.setRecords(ocpTenantGroupList); - page.setTotal(ocpTenantGroupList.size()); } } else if (!(StringUtils.isBlank(keyword))) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))