merge

zhangqian

2023-11-13 a8849056eebef42a33353e8652de13822f440632

 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