|
@@ -397,6 +397,7 @@ func (this *UserController) List() {
|
|
|
return
|
|
|
}
|
|
|
var userIds string
|
|
|
+ var userIdArr []int
|
|
|
if list != nil {
|
|
|
for k, v := range list {
|
|
|
if v.RegisterTime != "" {
|
|
@@ -426,6 +427,7 @@ func (this *UserController) List() {
|
|
|
}
|
|
|
}
|
|
|
userIds += strconv.Itoa(int(v.UserId)) + ","
|
|
|
+ userIdArr = append(userIdArr, int(v.UserId))
|
|
|
}
|
|
|
userIds = strings.TrimRight(userIds, ",")
|
|
|
splitList, err := cygx.GetCygxCompanyUserListSplit(userIds)
|
|
@@ -448,6 +450,8 @@ func (this *UserController) List() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ UserRemindListMap := cygxService.GetCygxUserRemindListMap(userIdArr)
|
|
|
+
|
|
|
for k, v := range list {
|
|
|
for _, vsplit := range splitList {
|
|
|
if vsplit.UserId == v.UserId {
|
|
@@ -468,6 +472,7 @@ func (this *UserController) List() {
|
|
|
if mapUserRemarks[int(v.UserId)] != "" {
|
|
|
list[k].Content = mapUserRemarks[int(v.UserId)]
|
|
|
}
|
|
|
+ list[k].IsRemind = UserRemindListMap[int(v.UserId)]
|
|
|
}
|
|
|
for k := range list {
|
|
|
list[k].InteractionNum = list[k].HistoryNum + list[k].CountNum + list[k].IndustryFllowNum + list[k].DepartmentFollowNum + list[k].KeyWordNum + list[k].OnLineNum + list[k].OfficeNum + list[k].ChartNum + list[k].TripNum + list[k].RoadshowVideoNum + list[k].ActivityVideoNum + list[k].ActivityVoiceNum
|