From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
api/v1/client.go | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/api/v1/client.go b/api/v1/client.go
index e2c09de..ff33fad 100644
--- a/api/v1/client.go
+++ b/api/v1/client.go
@@ -1,11 +1,13 @@
package v1
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/model/request"
"aps_crm/model/response"
"aps_crm/pkg/contextx"
"aps_crm/pkg/ecode"
+ "aps_crm/utils"
"github.com/gin-gonic/gin"
)
@@ -32,13 +34,15 @@
return
}
- //CreatorId, b := c.Get("claims")
- //if !b {
- // ctx.Fail(ecode.JWTParseErr)
- // return
- //}
- //
- //client.CreatorId = CreatorId.(int)
+ count, err := model.NewClientSearch(nil).SetNumber(client.Number).Count()
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触")
+ return
+ }
+ if count > 0 {
+ ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�")
+ return
+ }
errCode = clientService.AddClient(client, params.SalesLeadsId)
if errCode != ecode.OK {
@@ -106,6 +110,7 @@
client.Business.EnterpriseNatureId = params.EnterpriseNatureId
client.Business.EnterpriseScaleId = params.EnterpriseScaleId
client.MemberId = params.MemberId
+ client.CodeStandID = params.CodeStandID
//if params.Contact.Name != "" {
// assign the client's member id to contact when adding
@@ -198,6 +203,22 @@
return
}
+ var isPublic bool
+ if params.SearchMap != nil && params.SearchMap["is_public"] != nil {
+ if v, ok := params.SearchMap["is_public"].(bool); ok {
+ isPublic = v
+ }
+ }
+ if !isPublic {
+ userInfo := utils.GetUserInfo(c)
+ if userInfo.UserType == constvar.UserTypeSub {
+ if params.SearchMap == nil {
+ params.SearchMap = make(map[string]interface{}, 0)
+ }
+ params.SearchMap["member_ids"] = userInfo.SubUserIds
+ }
+ }
+
clients, total, errCode := clientService.GetClientList(params.Page, params.PageSize, params.SearchMap)
if errCode != ecode.OK {
ctx.Fail(errCode)
--
Gitblit v1.8.0