From c7216aa035f4f8fa93678f5310e7b20cb853ab5c Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Mon, 12 Aug 2024 11:29:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=8F=90=E6=8A=A5=E5=85=88=E9=80=89=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=88=86=E9=A1=B5=E6=B2=A1=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/models/purchase.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/admin/models/purchase.go b/app/admin/models/purchase.go
index ec0a830..b2ea995 100644
--- a/app/admin/models/purchase.go
+++ b/app/admin/models/purchase.go
@@ -1873,7 +1873,6 @@ func getErpPurchaseDemandAll(req *GetErpPurchaseDemandReq, c *gin.Context) (*Get
 
 	qs := orm.Eloquent.Debug().Table("erp_commodity")
 	if req.ErpCategoryId != 0 {
-		page = 0
 		categoryInfo, err := GetErpCategory(req.ErpCategoryId)
 		if err != nil {
 			return nil, err
@@ -1881,15 +1880,12 @@ func getErpPurchaseDemandAll(req *GetErpPurchaseDemandReq, c *gin.Context) (*Get
 		qs = qs.Where("serial_number like ?", categoryInfo.Number+"%")
 	}
 	if req.ErpCommoditySerialNumber != "" {
-		page = 0
 		qs = qs.Where("serial_number=?", req.ErpCommoditySerialNumber)
 	}
 	if req.ErpCommodityName != "" {
-		page = 0
 		qs = qs.Where("name=?", req.ErpCommodityName)
 	}
 	if req.ErpSupplierId != 0 {
-		page = 0
 		qs = qs.Where("erp_supplier_id=?", req.ErpSupplierId)
 	}
 
@@ -2051,6 +2047,9 @@ func getErpPurchaseDemandAll(req *GetErpPurchaseDemandReq, c *gin.Context) (*Get
 	} else {
 		// 计算分页
 		startIndex := page * req.PageSize
+		if startIndex > len(commodities) {
+			startIndex = 0
+		}
 		endIndex := (page + 1) * req.PageSize
 		if endIndex > len(commodities) {
 			endIndex = len(commodities)
@@ -2202,11 +2201,9 @@ func getErpPurchaseDemandHide(req *GetErpPurchaseDemandReq, c *gin.Context) (*Ge
 		}
 	}
 	if req.ErpCommodityName != "" {
-		page = 0
 		demandQs = demandQs.Where("erp_commodity_name = ?", req.ErpCommodityName)
 	}
 	if req.ErpSupplierId != 0 {
-		page = 0
 		demandQs = demandQs.Where("erp_supplier_id=?", req.ErpSupplierId)
 	}
 	err = demandQs.Find(&demand).Error
@@ -2348,6 +2345,9 @@ func getErpPurchaseDemandHide(req *GetErpPurchaseDemandReq, c *gin.Context) (*Ge
 		} else {
 			// 计算分页
 			startIndex := page * req.PageSize
+			if startIndex > len(matchedCommodities) {
+				startIndex = 0
+			}
 			endIndex := (page + 1) * req.PageSize
 			if endIndex > len(matchedCommodities) {
 				endIndex = len(matchedCommodities)