From f264456b1e4fd284f53ecc4c70a3b951578bfd2d Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期五, 18 八月 2023 17:13:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- service/serviceCollectionPlan.go | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/serviceCollectionPlan.go b/service/serviceCollectionPlan.go index fdaa235..f87f5a4 100644 --- a/service/serviceCollectionPlan.go +++ b/service/serviceCollectionPlan.go @@ -17,9 +17,9 @@ if len(serviceCollectionPlan) == 0 { return ecode.ParamsErr } - contractId := serviceCollectionPlan[0].ServiceContractId + sourceId := serviceCollectionPlan[0].SourceId err := model.WithTransaction(func(db *gorm.DB) error { - err := model.NewServiceCollectionPlanSearch().SetOrm(db).SetServiceContractId(contractId).Delete() + err := model.NewServiceCollectionPlanSearch().SetOrm(db).SetSourceId(sourceId).Delete() if err != nil { return err } @@ -45,8 +45,8 @@ return ecode.OK } -func (ServiceCollectionPlanService) GetServiceCollectionPlanList(contractId int) ([]*model.ServiceCollectionPlan, int64, int) { - list, total, err := model.NewServiceCollectionPlanSearch().SetServiceContractId(contractId).Find() +func (ServiceCollectionPlanService) GetServiceCollectionPlanList(sourceId int) ([]*model.ServiceCollectionPlan, int64, int) { + list, total, err := model.NewServiceCollectionPlanSearch().SetSourceId(sourceId).Find() if err != nil { return nil, 0, ecode.DBErr } -- Gitblit v1.8.0