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

---
 service/dataServer.go |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/service/dataServer.go b/service/dataServer.go
index 4ea3990..63f1d40 100644
--- a/service/dataServer.go
+++ b/service/dataServer.go
@@ -1,13 +1,16 @@
 package service
 
 import (
+	"aps_crm/constvar"
 	"aps_crm/model/response"
 	"aps_crm/pkg/ecode"
+	"aps_crm/utils"
+	"github.com/gin-gonic/gin"
 )
 
 type DataServer struct{}
 
-func (DataServer) GetAllData() (errCode int, data response.DataResponse) {
+func (DataServer) GetAllData(c *gin.Context) (errCode int, data response.DataResponse) {
 	// get country list
 	countryList, _ := ServiceGroup.GetCountryList()
 	data.Country = countryList
@@ -73,7 +76,14 @@
 	data.RegularCustomers = regularCustomerList
 
 	// get Member list
-	memberList, _ := ServiceGroup.GetUserList()
+
+	var memberIds []int
+	userInfo := utils.GetUserInfo(c)
+	if userInfo.UserType == constvar.UserTypeSub {
+		memberIds = userInfo.SubUserIds
+	}
+
+	memberList, _ := ServiceGroup.GetUserList(memberIds)
 	data.Member = memberList
 
 	// get Department list

--
Gitblit v1.8.0