From 88702f1d3db33a3ee166ba7615ae39b8a719143f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 13 十月 2023 15:26:51 +0800
Subject: [PATCH] Merge branch 'feat-sso'
---
service/serviceOrder.go | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/service/serviceOrder.go b/service/serviceOrder.go
index 97c6df1..6598ad0 100644
--- a/service/serviceOrder.go
+++ b/service/serviceOrder.go
@@ -38,7 +38,7 @@
return ecode.OK
}
-func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string, serviceContractId, salesDetailsId int) ([]*model.ServiceOrder, int64, int) {
+func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string, serviceContractId, salesDetailsId int, memberIds []int) ([]*model.ServiceOrder, int64, int) {
list, total, err := model.NewServiceOrderSearch().
SetPage(page, pageSize).
SetKeyword(keyword).
@@ -47,6 +47,7 @@
SetPreload(true).
SetServiceContractId(serviceContractId).
SetSalesDetailsId(salesDetailsId).
+ SetMemberIds(memberIds).
Find()
if err != nil {
return nil, 0, ecode.DBErr
--
Gitblit v1.8.0