From 493ad64a1f17ceeb70ec834162a0ad3572d28d69 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 11:44:16 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
api/v1/serviceContract.go | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index d354aa2..bd10717 100644
--- a/api/v1/serviceContract.go
+++ b/api/v1/serviceContract.go
@@ -6,6 +6,7 @@
"aps_crm/model/response"
"aps_crm/pkg/contextx"
"aps_crm/pkg/ecode"
+ "aps_crm/pkg/structx"
"github.com/gin-gonic/gin"
)
@@ -26,13 +27,13 @@
return
}
- errCode, serviceContract := checkServiceContractParams(params.ServiceContract)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
+ serviceContract := new(model.ServiceContract)
+ if err := structx.AssignTo(params, serviceContract); err != nil {
+ ctx.Fail(ecode.ParamsErr)
return
}
- errCode = serviceContractService.AddServiceContract(&serviceContract)
+ errCode := serviceContractService.AddServiceContract(serviceContract)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
@@ -80,15 +81,15 @@
return
}
- errCode, serviceContract := checkServiceContractParams(params.ServiceContract)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
+ serviceContract := new(model.ServiceContract)
+ if err := structx.AssignTo(params, serviceContract); err != nil {
+ ctx.Fail(ecode.ParamsErr)
return
}
serviceContract.Id = params.Id
- errCode = serviceContractService.UpdateServiceContract(&serviceContract)
+ errCode := serviceContractService.UpdateServiceContract(serviceContract)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
--
Gitblit v1.8.0