From 4b2c52b17abef8521f9211b4865e1cad0288b12a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 21 十月 2023 17:47:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 api/v1/client.go |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/api/v1/client.go b/api/v1/client.go
index 839083a..37016eb 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"
 )
 
@@ -24,6 +26,13 @@
 	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
+	}
+
+	if params.MemberId == 0 {
+		userInfo := utils.GetUserInfo(c)
+		if userInfo.UserType == constvar.UserTypeSub {
+			params.MemberId = userInfo.CrmUserId
+		}
 	}
 
 	errCode, client := checkClientParams(params.Client)
@@ -112,7 +121,12 @@
 	client.Business.IndustryId = params.IndustryId
 	client.Business.EnterpriseNatureId = params.EnterpriseNatureId
 	client.Business.EnterpriseScaleId = params.EnterpriseScaleId
-	client.MemberId = params.MemberId
+	//閿�鍞礋璐ｄ汉涓虹┖鏃朵负鍏捣瀹㈡埛
+	if params.MemberId == 0 {
+		client.MemberId = 1
+	} else {
+		client.MemberId = params.MemberId
+	}
 	client.CodeStandID = params.CodeStandID
 
 	//if params.Contact.Name != "" {
@@ -206,6 +220,14 @@
 		return
 	}
 
+	userInfo := utils.GetUserInfo(c)
+	if userInfo.UserType == constvar.UserTypeSub {
+		if params.SearchMap == nil {
+			params.SearchMap = make(map[string]interface{}, 0)
+		}
+		params.SearchMap["member_id"] = userInfo.CrmUserId
+	}
+
 	clients, total, errCode := clientService.GetClientList(params.Page, params.PageSize, params.SearchMap)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)

--
Gitblit v1.8.0