From 5a356c6178e15b44bdfe4cf3e94c52b0d4a17668 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 15 八月 2023 17:32:25 +0800
Subject: [PATCH] 完善退货单查询，fix一些bug
---
service/salesReturn.go | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/service/salesReturn.go b/service/salesReturn.go
index 6a4bab0..e2b3284 100644
--- a/service/salesReturn.go
+++ b/service/salesReturn.go
@@ -1,6 +1,7 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
)
@@ -44,9 +45,14 @@
return ecode.OK
}
-func (SalesReturnService) GetSalesReturnList(page, pageSize int, keyword string) ([]*model.SalesReturn, int64, int) {
+func (SalesReturnService) GetSalesReturnList(page, pageSize int, keywordType constvar.SalesReturnKeywordType, keyword string) ([]*model.SalesReturn, int64, int) {
// get contact list
- contacts, total, err := model.NewSalesReturnSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewSalesReturnSearch().
+ SetKeywordType(keywordType).
+ SetKeyword(keyword).
+ SetPage(page, pageSize).
+ SetPreload(true).
+ FindAll()
if err != nil {
return nil, 0, ecode.SalesReturnListErr
}
--
Gitblit v1.8.0