Merge branch 'cygx_12.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -1775,6 +1775,10 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	if activityTypeId == "undefined" {
 		activityTypeId = ""
 	}
+
+	if activityTypeId == "5" {
+		activityTypeId = "5,8" //专家线下沙龙可以查看买方线下交流
+	}
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -2401,6 +2405,11 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		if v.ActivityTypeId == 7 {
 			v.ActivityTypeId = 2
 		}
+
+		// 如果是买方线下交流的活动，合并到专家线下交流
+		if v.ActivityTypeId == 8 {
+			v.ActivityTypeId = 5
+		}
 		item := new(models.CygxActivityLabelList)
 		item.IsResearchPoints = activityPointsByUserAllMap[v.ActivityId]
 		item.City = mapCity[fmt.Sprint(v.KeyWord, "{|}", v.ActivityTypeId)]