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
---
service/dataServer.go | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/service/dataServer.go b/service/dataServer.go
index ab15917..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
@@ -105,7 +115,7 @@
data.OrderType = orderTypeList
// get ServiceContractStatus list
- serviceContractStatusList, _ := ServiceGroup.GetServiceContractStatusList()
+ serviceContractStatusList, _, _ := ServiceGroup.GetServiceContractStatusList()
data.ServiceContractStatus = serviceContractStatusList
// get ServiceContractType list
@@ -148,8 +158,7 @@
currencyList, _ := ServiceGroup.GetCurrencyList()
data.Currency = currencyList
-
errCode = ecode.OK
return
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0