From 780416dd70d9c863ddf8121b5c017db7a0801956 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 23 十一月 2023 18:41:37 +0800
Subject: [PATCH] 供应商修改

---
 service/purchase/purchase.go |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index ab378ab..7771ac8 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -140,20 +140,18 @@
 		if err != nil {
 			return purchaseList, total, err
 		}
-	}
-
-	if info.SupplierId != 0 {
+	} else if info.SupplierId != 0 {
 		db = db.Where("supplier_id = ?", info.SupplierId)
 	}
 	err = db.Count(&total).Error
-	if err != nil {
+	if err != nil || total == 0 {
 		return purchaseList, total, err
 	}
 	if len(ids) != 0 {
 		db = global.GVA_DB.Model(&purchase.Purchase{})
 		err = db.Where("id in (?)", ids).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
 	} else {
-		db = global.GVA_DB.Model(&purchase.Purchase{})
+		//db = global.GVA_DB.Model(&purchase.Purchase{})
 		err = db.Limit(limit).Offset(offset).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
 	}
 

--
Gitblit v1.8.0