From 2eac6c5264378e1f7c415351c1af11bed27946dc Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Thu, 24 Mar 2022 14:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/pms/ocp/service/TenantService.java      | 5 +----
 .../com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java   | 6 +++---
 .../java/com/pms/ocp/service/impl/TenantServiceImpl.java  | 8 +-------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java
index 410986b..7129898 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<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);
 
 
 
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 e580bf8..ebcdeed 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<OcpApiTreeMapper, OcpApiG
             } else if(!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))){
                 List<OcpApiGroup> 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<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;
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 ffd58ca..68648c2 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<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))
-- 
2.26.0