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
---
service/salesDetails.go | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service/salesDetails.go b/service/salesDetails.go
index 8c0b0a2..d504748 100644
--- a/service/salesDetails.go
+++ b/service/salesDetails.go
@@ -1,6 +1,7 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
)
@@ -44,9 +45,12 @@
return ecode.OK
}
-func (SalesDetailsService) GetSalesDetailsList(page, pageSize int, keyword string) ([]*model.SalesDetails, int64, int) {
+func (SalesDetailsService) GetSalesDetailsList(page, pageSize int, keywordType constvar.SalesDetailsKeywordType, keyword string) ([]*model.SalesDetails, int64, int) {
// get contact list
- contacts, total, err := model.NewSalesDetailsSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewSalesDetailsSearch().
+ SetPreload(true).
+ SetKeywordType(keywordType).
+ SetKeyword(keyword).SetPage(page, pageSize).FindAll()
if err != nil {
return nil, 0, ecode.SalesDetailsListErr
}
--
Gitblit v1.8.0