服务bug修改

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<OcpTenantGroup> {
      * @param tenantGroupCompanyCode
      * @return
      */
-    Page<OcpTenantGroup> getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev);
+    Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String text, String lev);
 
 
 

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

@@ -169,11 +169,11 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
                 List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode());
                 pageInfo.setRecords(ocpApiGroups);
                pageInfo.setTotal(ocpApiGroups.size());
+
             }
         } else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){
             LambdaQueryWrapper<OcpApiGroup> 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;

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

 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<TenantMapper, OcpTenantGroup>
                     tenantGroup.setClassIfy(ocpTenantGroup1.getTenantGroupName());
                 }
 //                LambdaQueryWrapper<OcpTenantGroup> 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<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))