From 91487fbd678ed772c5aa5b4e250f6f6e9616f219 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 14:54:18 +0800
Subject: [PATCH] fixt
---
model/process_model.go | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index aab6e62..2418f40 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -100,13 +100,8 @@
return slf
}
-func (slf *ProcessModelSearch) SetProductNot(product string) *ProcessModelSearch {
- slf.ProductNot = product
- return slf
-}
-
-func (slf *ProcessModelSearch) SetProcedureNot(procedure string) *ProcessModelSearch {
- slf.ProcedureNot = procedure
+func (slf *ProcessModelSearch) SetProductAndProcedureNot(product string, procedure string) *ProcessModelSearch {
+ slf.ProductNot, slf.ProcedureNot = product, procedure
return slf
}
@@ -135,12 +130,8 @@
db = db.Where("`procedure` = ?", slf.Procedure)
}
- if len(slf.ProductNot) != 0 {
- db = db.Where("product <> ?", slf.ProductNot)
- }
-
- if len(slf.ProcedureNot) != 0 {
- db = db.Where("`procedure` <> ?", slf.ProcedureNot)
+ if len(slf.ProductNot) != 0 && len(slf.ProcedureNot) != 0 {
+ db = db.Not("product = ? and procedure = ? ", slf.ProductNot, slf.ProcedureNot)
}
if len(slf.Procedures) != 0 {
--
Gitblit v1.8.0