From 68bb7ca9af76f83028da94c53436da679e00f067 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 21 十一月 2023 15:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
api/v1/contract.go | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/api/v1/contract.go b/api/v1/contract.go
index 8041742..22e46e4 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -35,6 +35,16 @@
return
}
+ count, err := model.NewContractSearch().SetNumber(params.Number).Count()
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触")
+ return
+ }
+ if count > 0 {
+ ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�")
+ return
+ }
+
if contract.MemberId == 0 {
userInfo := utils.GetUserInfo(c)
if userInfo.UserType == constvar.UserTypeSub {
@@ -46,14 +56,6 @@
if errCode != ecode.OK {
ctx.Fail(errCode)
return
- }
-
- if params.CodeRule.Method == 1 {
- autoCode := model.GetAutoCode(contract.Id, ¶ms.CodeRule)
- m := map[string]interface{}{
- "number": autoCode,
- }
- _ = model.NewContractSearch().SetId(contract.Id).UpdateByMap(m)
}
ctx.Ok()
@@ -138,6 +140,7 @@
File: contract.File,
CodeStandID: contract.CodeStandID,
ContractName: contract.ContractName,
+ SendTime: contract.SendTime,
}
return ecode.OK, contractModel
@@ -163,10 +166,10 @@
if params.SearchMap == nil {
params.SearchMap = make(map[string]interface{}, 0)
}
- params.SearchMap["member_id"] = userInfo.CrmUserId
+ params.SearchMap["member_ids"] = userInfo.SubUserIds
}
- contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap)
+ contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap, params.Keyword)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
--
Gitblit v1.8.0