From cc7f733c2e3e7fdfa03b904eacd0106dbd59c263 Mon Sep 17 00:00:00 2001
From: ColoThor <db5250@163.com>
Date: Wed, 7 Dec 2022 10:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedata/product/ProductController.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/xingyun-api/src/main/java/com/lframework/xingyun/api/controller/basedata/product/ProductController.java b/xingyun-api/src/main/java/com/lframework/xingyun/api/controller/basedata/product/ProductController.java
index 07e3a87b..cf2c4d21 100644
--- a/xingyun-api/src/main/java/com/lframework/xingyun/api/controller/basedata/product/ProductController.java
+++ b/xingyun-api/src/main/java/com/lframework/xingyun/api/controller/basedata/product/ProductController.java
@@ -190,8 +190,8 @@ public class ProductController extends DefaultBaseController {
   public InvokeResult<PageResult<PurchaseProductBo>> queryPurchaseProductList(
       @Valid QueryPurchaseProductVo vo) {
 
-    PageResult<PurchaseProductDto> pageResult = productService.queryPurchaseList(getPageIndex(),
-        getPageSize(), vo);
+    PageResult<PurchaseProductDto> pageResult = productService.queryPurchaseList(getPageIndex(vo),
+        getPageSize(vo), vo);
     List<PurchaseProductBo> results = null;
     List<PurchaseProductDto> datas = pageResult.getDatas();
 
@@ -239,8 +239,8 @@ public class ProductController extends DefaultBaseController {
   public InvokeResult<PageResult<RetailProductBo>> queryRetailProductList(
       @Valid QueryRetailProductVo vo) {
 
-    PageResult<RetailProductDto> pageResult = productService.queryRetailList(getPageIndex(),
-        getPageSize(), vo);
+    PageResult<RetailProductDto> pageResult = productService.queryRetailList(getPageIndex(vo),
+        getPageSize(vo), vo);
     List<RetailProductBo> results = null;
     List<RetailProductDto> datas = pageResult.getDatas();
     if (!CollectionUtil.isEmpty(datas)) {
@@ -287,8 +287,8 @@ public class ProductController extends DefaultBaseController {
   public InvokeResult<PageResult<SaleProductBo>> querySaleProductList(
       @Valid QuerySaleProductVo vo) {
 
-    PageResult<SaleProductDto> pageResult = productService.querySaleList(getPageIndex(),
-        getPageSize(), vo);
+    PageResult<SaleProductDto> pageResult = productService.querySaleList(getPageIndex(vo),
+        getPageSize(vo), vo);
     List<SaleProductBo> results = null;
     List<SaleProductDto> datas = pageResult.getDatas();
     if (!CollectionUtil.isEmpty(datas)) {
@@ -335,7 +335,7 @@ public class ProductController extends DefaultBaseController {
       @Valid QueryStockCostAdjustProductVo vo) {
 
     PageResult<StockCostAdjustProductDto> pageResult = productService.queryStockCostAdjustList(
-        getPageIndex(), getPageSize(), vo);
+        getPageIndex(vo), getPageSize(vo), vo);
     List<StockCostAdjustProductBo> results = null;
     List<StockCostAdjustProductDto> datas = pageResult.getDatas();
 
@@ -379,7 +379,7 @@ public class ProductController extends DefaultBaseController {
       @Valid QueryPreTakeStockProductVo vo) {
 
     PageResult<PreTakeStockProductDto> pageResult = productService.queryPreTakeStockList(
-        getPageIndex(), getPageSize(), vo);
+        getPageIndex(vo), getPageSize(vo), vo);
     List<PreTakeStockProductBo> results = null;
     List<PreTakeStockProductDto> datas = pageResult.getDatas();
 
@@ -439,7 +439,7 @@ public class ProductController extends DefaultBaseController {
     }
 
     PageResult<TakeStockSheetProductDto> pageResult = productService.queryTakeStockList(
-        getPageIndex(), getPageSize(), vo);
+        getPageIndex(vo), getPageSize(vo), vo);
     List<TakeStockSheetProductBo> results = null;
     List<TakeStockSheetProductDto> datas = pageResult.getDatas();
 
-- 
Gitee