From b3a47cb555076c25c64d83dd455a472509291245 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 13 十一月 2023 16:09:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
api/v1/client.go | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/api/v1/client.go b/api/v1/client.go
index d7dc42e..ff33fad 100644
--- a/api/v1/client.go
+++ b/api/v1/client.go
@@ -28,13 +28,6 @@
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)
@@ -116,12 +109,7 @@
client.Business.IndustryId = params.IndustryId
client.Business.EnterpriseNatureId = params.EnterpriseNatureId
client.Business.EnterpriseScaleId = params.EnterpriseScaleId
- //閿�鍞礋璐ｄ汉涓虹┖鏃朵负鍏捣瀹㈡埛
- if params.MemberId == 0 {
- client.MemberId = 1
- } else {
- client.MemberId = params.MemberId
- }
+ client.MemberId = params.MemberId
client.CodeStandID = params.CodeStandID
//if params.Contact.Name != "" {
@@ -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