From eb65f4c3c6903b11424eeaefe46653acedf24448 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 09:40:22 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/serviceContract.go | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/service/serviceContract.go b/service/serviceContract.go
index 7666a9f..45907c8 100644
--- a/service/serviceContract.go
+++ b/service/serviceContract.go
@@ -17,19 +17,6 @@
return ecode.OK
}
-func (SContractService) DeleteServiceContract(id int) int {
- _, err := model.NewServiceContractSearch().SetId(id).Find()
- if err != nil {
- return ecode.SContractNotExist
- }
-
- err = model.NewServiceContractSearch().SetId(id).Delete()
- if err != nil {
- return ecode.SContractNotExist
- }
- return ecode.OK
-}
-
func (SContractService) UpdateServiceContract(serviceContract *model.ServiceContract) int {
// check serviceContract exist
_, err := model.NewServiceContractSearch().SetId(serviceContract.Id).Find()
@@ -54,6 +41,15 @@
// return list, ecode.OK
//}
+func (SContractService) DeleteServiceContract(ids []int) int {
+ // delete client
+ err := model.NewServiceContractSearch().SetIds(ids).Delete()
+ if err != nil {
+ return ecode.SContractDeleteErr
+ }
+ return ecode.OK
+}
+
func (SContractService) GetServiceContractList(page, pageSize int, queryClass constvar.ServiceContractQueryClass, keywordType constvar.ServiceContractKeywordType, keyword string) ([]*model.ServiceContract, int64, int) {
// get contact list
contacts, total, err := model.NewServiceContractSearch().
--
Gitblit v1.8.0