From 5421f9d925a15eddfcaf356839ee1a180b36689a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 14:01:35 +0800
Subject: [PATCH] Merge branch 'hotfix'

---
 service/serviceCollectionPlan.go |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/service/serviceCollectionPlan.go b/service/serviceCollectionPlan.go
index f87f5a4..c1f1af7 100644
--- a/service/serviceCollectionPlan.go
+++ b/service/serviceCollectionPlan.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"aps_crm/constvar"
 	"aps_crm/model"
 	"aps_crm/model/request"
 	"aps_crm/pkg/ecode"
@@ -45,8 +46,8 @@
 	return ecode.OK
 }
 
-func (ServiceCollectionPlanService) GetServiceCollectionPlanList(sourceId int) ([]*model.ServiceCollectionPlan, int64, int) {
-	list, total, err := model.NewServiceCollectionPlanSearch().SetSourceId(sourceId).Find()
+func (ServiceCollectionPlanService) GetServiceCollectionPlanList(sourceType constvar.CollectionSourceType, sourceId int) ([]*model.ServiceCollectionPlan, int64, int) {
+	list, total, err := model.NewServiceCollectionPlanSearch().SetSourceType(sourceType).SetSourceId(sourceId).Find()
 	if err != nil {
 		return nil, 0, ecode.DBErr
 	}

--
Gitblit v1.8.0