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 |   48 ++++++++++++++++++++++--------------------------
 1 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/api/v1/client.go b/api/v1/client.go
index bac72a8..ff33fad 100644
--- a/api/v1/client.go
+++ b/api/v1/client.go
@@ -28,38 +28,26 @@
 		return
 	}
 
-	if params.MemberId == 0 {
-		userInfo := utils.GetUserInfo(c)
-		if userInfo.UserType == constvar.UserTypeSub {
-			params.MemberId = userInfo.CrmUserId
-		}
-	}
-
 	errCode, client := checkClientParams(params.Client)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		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 {
 		ctx.Fail(errCode)
 		return
-	}
-	if params.CodeRule.Method == 1 {
-		autoCode := model.GetAutoCode(client.Id, &params.CodeRule)
-		m := map[string]interface{}{
-			"number": autoCode,
-		}
-		_ = model.NewClientSearch(nil).SetId(client.Id).UpdateByMap(m)
 	}
 
 	ctx.Ok()
@@ -215,12 +203,20 @@
 		return
 	}
 
-	userInfo := utils.GetUserInfo(c)
-	if userInfo.UserType == constvar.UserTypeSub {
-		if params.SearchMap == nil {
-			params.SearchMap = make(map[string]interface{}, 0)
+	var isPublic bool
+	if params.SearchMap != nil && params.SearchMap["is_public"] != nil {
+		if v, ok := params.SearchMap["is_public"].(bool); ok {
+			isPublic = v
 		}
-		params.SearchMap["member_id"] = userInfo.CrmUserId
+	}
+	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)

--
Gitblit v1.8.0