From 33834ca3163e1b6505ea7407a6de305ba5707e90 Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Thu, 24 Mar 2022 10:58:33 +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/OcpApiTreeService.java    | 4 ++++
 src/main/java/com/pms/ocp/service/TenantService.java        | 4 ++++
 .../com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java     | 6 +++++-
 .../java/com/pms/ocp/service/impl/TenantServiceImpl.java    | 3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java
index 7fd9f90..39449d8 100644
--- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java
+++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java
@@ -9,6 +9,10 @@ import com.pms.ocp.model.entity.OcpApiGroup;
 import java.util.List;
 
 
+/**
+ * @author zhaochengming
+ */
+
 public interface OcpApiTreeService extends IService<OcpApiGroup> {
 
     /**
diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java
index abd2e53..410986b 100644
--- a/src/main/java/com/pms/ocp/service/TenantService.java
+++ b/src/main/java/com/pms/ocp/service/TenantService.java
@@ -11,6 +11,10 @@ import com.pms.ocp.model.vo.ResponseVO;
 import java.util.List;
 import java.util.Set;
 
+
+/**
+ * @author zhaochengming
+ */
 public interface TenantService  extends IService<OcpTenantGroup> {
     /**
      * 应用树分类管理
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 a989f17..e580bf8 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
@@ -25,6 +25,10 @@ import java.util.List;
 import java.util.stream.Stream;
 
 
+/**
+ * @author zhaochengming
+ */
+
 @Service
 @Slf4j
 public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiGroup> implements OcpApiTreeService {
@@ -166,7 +170,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
                 pageInfo.setRecords(ocpApiGroups);
                 pageInfo.setTotal(ocpApiGroups.size());
             }
-        } else {
+        } 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());
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 f72ea0c..ffd58ca 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
@@ -24,6 +24,9 @@ import java.sql.Timestamp;
 import java.util.*;
 
 
+/**
+ * @author zhaochengming
+ */
 @Service
 public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> implements TenantService {
 
-- 
2.26.0