From 012da13206f2e4d6a3871b050c71a3b237878424 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 16:39:32 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
model/serviceContract.go | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index 1b6b901..14a5e7a 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -44,7 +44,6 @@
ServiceContractSearch struct {
ServiceContract
-
Orm *gorm.DB
QueryClass constvar.ServiceContractQueryClass
KeywordType constvar.ServiceContractKeywordType
@@ -95,10 +94,9 @@
db = db.Joins("left join service_contract_status on service_contract_status.id = service_contract.service_contract_status_id")
db = db.Where("service_contract_status.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordPrincipal:
- db = db.Joins("left join user on user.id = service_contract.member_id")
- db = db.Where("user.username like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
+ db = db.Joins("left join user on user.id = service_contract.member_id").Where("user.username like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordProductName:
- //db = db.Joins("ServiceContractProduct", clause.LeftJoin).Joins("Product", clause.LeftJoin).Where("Product.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword)) todo
+ db = db.Joins("Products", clause.LeftJoin).Where("Products.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
case constvar.ServiceContractKeywordServiceBeginDate:
db = db.Where("start_time = ?", slf.Keyword)
case constvar.ServiceContractKeywordServiceEndDate:
--
Gitblit v1.8.0