From 07e6aef8e864171778345df3574cf163a0c6bef5 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 21 十一月 2023 17:27:49 +0800
Subject: [PATCH] bug修改

---
 service/test/product.go  |    2 +-
 service/test/supplier.go |    3 +++
 api/v1/test/product.go   |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/v1/test/product.go b/api/v1/test/product.go
index aba8c67..20bd865 100644
--- a/api/v1/test/product.go
+++ b/api/v1/test/product.go
@@ -248,7 +248,7 @@
 		return
 	}
 
-	productList := make([]testResp.Material, len(list))
+	productList := make([]testResp.Material, 0)
 
 	for _, item := range list {
 		productList = append(productList, testResp.Material{
diff --git a/service/test/product.go b/service/test/product.go
index 8ad82b5..f73d77e 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -115,7 +115,7 @@
 	db := global.GVA_DB.Model(&test.Material{})
 	var ps []test.Material
 	if info.Keyword != "" {
-		db = db.Where("name LIKE ? or number LIKE ?", "%"+info.Name+"%", "%"+info.Number+"%")
+		db = db.Where("name LIKE ? or id LIKE ?", "%"+info.Keyword+"%", "%"+info.Keyword+"%")
 	}
 
 	db = db.Where("purchase_type = ?", test.PurchaseTypeOutSource)
diff --git a/service/test/supplier.go b/service/test/supplier.go
index aea759d..082d181 100644
--- a/service/test/supplier.go
+++ b/service/test/supplier.go
@@ -78,6 +78,9 @@
 	if info.CreatedAt != nil {
 		db = db.Where("created_at = ?", info.CreatedAt)
 	}
+	if info.Status != 0 {
+		db = db.Where("status = ?", info.Status)
+	}
 	err = db.Count(&total).Error
 	if err != nil {
 		return

--
Gitblit v1.8.0