no message

services/cygx/user_label.go

@@ -337,6 +337,17 @@ func HandleListRsCalendar(list []*roadshow.RsCalendarMeetingUserByRai) (items []
 		}
 	}
 
+	mapGroupindustrialManagementName := make(map[int][]string)
+	mapGroupindustrialSubjectName := make(map[int][]string)
+	for _, v := range listGroup {
+		switch v.TagType {
+		case 1:
+			mapGroupindustrialManagementName[v.RsCalendarId] = append(mapGroupindustrialManagementName[v.RsCalendarId], mapindustrialManagementName[v.TagId])
+		case 2:
+			mapGroupindustrialSubjectName[v.RsCalendarId] = append(mapGroupindustrialSubjectName[v.RsCalendarId], mapindustrialSubjectName[v.TagId])
+		}
+	}
+
 	for _, v := range list {
 		item := new(cygx.UserInteraction)
 		item.UserId = v.UserId
@@ -346,13 +357,12 @@ func HandleListRsCalendar(list []*roadshow.RsCalendarMeetingUserByRai) (items []
 		item.CompanyName = v.CompanyName
 		switch v.TagType {
 		case 1:
-			item.LabelKeyWord = "富强,民主,自由,和谐"
+			item.LabelKeyWord = strings.Join(mapGroupindustrialManagementName[v.RsCalendarId], ",")
 		case 2:
-			item.LabelKeyWord = "富强,民主,自由,和谐"
+			item.LabelKeyWord = strings.Join(mapGroupindustrialSubjectName[v.RsCalendarId], ",")
 		case 3:
 			item.LabelKeyWord = mapCelueName[v.RsCalendarId]
 		}
-		item.LabelKeyWord = "富强,民主,自由,和谐"
 		item.ActivityTimeText = v.StartDate + "（" + v.StartWeek + "）" + v.StartTime + "-" + v.EndTime
 		item.ResearcherName = strings.Join(mapResearcherName[v.RsCalendarId], ",")
 		items = append(items, item)