From 2b5c893619ddf0955feafcfb4993009723ac4a17 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 29 三月 2024 15:34:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
service/test/product.go | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/service/test/product.go b/service/test/product.go
index 57ad6d9..58fb488 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -73,7 +73,13 @@
var ps []test.SupplierMaterial
//鎼滅储妗嗗悎涓�娣诲姞鏌ヨ鏉′欢
if info.Keyword != "" {
- db = db.Where("`srm_supplier_material`.name LIKE ?", "%"+info.Keyword+"%").Joins("Supplier").Or("Supplier.name LIKE ?", "%"+info.Keyword+"%")
+ kw := "%" + info.Keyword + "%"
+ if info.SupplierId == 0 {
+ db = db.Where("`srm_supplier_material`.name LIKE ?", kw).Joins("Supplier").Or("Supplier.name LIKE ?", kw)
+ } else {
+ db = db.Where("name LIKE ? OR number LIKE ? OR specifications LIKE ?", kw, kw, kw)
+ }
+
}
if info.Name != "" {
db = db.Where("name LIKE ?", "%"+info.Name+"%")
--
Gitblit v1.8.0