From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/serviceFollowup.go | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/service/serviceFollowup.go b/service/serviceFollowup.go
index 1ae3722..46c52c9 100644
--- a/service/serviceFollowup.go
+++ b/service/serviceFollowup.go
@@ -41,13 +41,14 @@
return ecode.OK
}
-func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string) ([]*model.ServiceFollowup, int64, int) {
+func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string, serviceOrderId int) ([]*model.ServiceFollowup, int64, int) {
// get contact list
contacts, total, err := model.NewServiceFollowupSearch().
SetKeywordType(keywordType).
SetKeyword(keyword).
SetPage(page, pageSize).
SetPreload(true).
+ SetServiceOrderId(serviceOrderId).
FindAll()
if err != nil {
return nil, 0, ecode.ServiceFollowupListErr
--
Gitblit v1.8.0