From 9b405d7746cd3472f874c8630d1556ed31fc1791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= <hello@itcast.cn>
Date: Thu, 31 Mar 2022 18:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/ocp/service/impl/ApiBasicManagementServiceImpl.java   | 4 ++--
 src/main/resources/mapper/OcpApiGroupMapper.xml               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
index 3e379f6..43bb56a 100644
--- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
@@ -179,12 +179,12 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
 
     @Override
     public ResponseVO<PageInfo<OcpApiBaseVo>> getBaseByGroupCode(ApiBaseDto apiBaseReq) {
-        if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) {
+        if (apiBaseReq.getCurrentPage() == null || apiBaseReq.getPageSize() == null) {
             return ResponseVO.error("分页参数不能为空");
         }
         apiGroupCode.add(apiBaseReq.getApiGroupCode());
         setGroupIdValue(apiBaseReq.getApiGroupCompanyCode(), apiBaseReq.getApiGroupCode(), apiBaseReq.getApiPromotion());
-        PageHelper.startPage(apiBaseReq.getPageNum(), apiBaseReq.getPageSize());
+        PageHelper.startPage(apiBaseReq.getCurrentPage(), apiBaseReq.getPageSize());
         apiBaseReq.setApiGroupCodeList(apiGroupCode);
         List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
         apiGroupCode.clear();
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index eef60e4..8e13471 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -97,7 +97,7 @@
                 and oab.api_user_name like CONCAT('%', #{apiUserName}::text,'%')
             </if>
 
-            <if test="apiPromotion !=null and apiPromotion!=''">
+            <if test="apiPromotion !=null ">
                 and oab.api_promotion = #{apiPromotion}
             </if>
             <if test="startCTime !=null  and startCTime!= ''">
-- 
2.26.0