Merge branch 'cygx_9.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -3154,6 +3154,9 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 			br.ErrMsg = "获取失败，Err:" + err.Error()
 			return
 		}
+		var itemslabe []*models.CygxActivityLabelList
+
+		mapkeyWord := make(map[string]string)
 		//标签字段关联的产业与标签处理
 		for k2, v2 := range labelList {
 			if v2.YidongActivityId != 0 {
@@ -3164,8 +3167,13 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 			}
 			labelList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName, v2.TemporaryLabel)
 			labelList[k2].ImgUrlBg = v.ImgUrlBgs
+			if _, ok := mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", labelList[k2].KeyWord)]; ok {
+				continue
+			}
+			itemslabe = append(itemslabe, labelList[k2])
+			mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", labelList[k2].KeyWord)] = labelList[k2].KeyWord
 		}
-		list[k].List = labelList
+		list[k].List = itemslabe
 		list[k].Resource = 1
 	}