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)