From 0f1d57bcfa35dfea251c814ef29330e9d64c10e6 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 13 Jul 2023 10:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/purchase/SupCompanyController.java   | 1 +
 .../api/service/purchase/impl/SupCompanyServiceImpl.java     | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java
index e908908d..394debcb 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java
@@ -81,6 +81,7 @@ public class SupCompanyController {
     @AuthRuleAnnotation("")
     @GetMapping("/api/pur/getSupComapnys")
     public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) {
+        System.out.println(companyRequest.toString());
         List<SupCompanyEntity> companyEntities = companyService.filterCompany(companyRequest);
         PageInfo<SupCompanyEntity> pageInfo = new PageInfo<>(companyEntities);
         PageSimpleResponse<SupCompanyEntity> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java
index d9554d6b..c8936902 100644
--- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java
@@ -36,9 +36,8 @@ public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao,SupCompanyE
         if (companyRequest == null) {
             return Collections.emptyList();
         }
-        if (companyRequest.getPage() != null) {
-            int offset = (companyRequest.getPage() - 1) * companyRequest.getLimit();
-            PageHelper.offsetPage(offset, companyRequest.getLimit());
+        if (null != companyRequest.getPage() && null != companyRequest.getLimit()) {
+            PageHelper.offsetPage((companyRequest.getPage() - 1) * companyRequest.getLimit(), companyRequest.getLimit());
         }
         return supCompanyDao.filterCompany(companyRequest);
     }