Merge branch 'cygx_10.7' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity.go

@@ -552,10 +552,6 @@ func (this *ActivityController) ActivityListNew() {
 	}
 	for _, v := range activityList {
 		v.SignupType = mapActivitySignup[v.ActivityId]
-		if v.ActivityTypeId != 3 && v.ActivityTypeId != 5 {
-			v.IsExternalLabel = false
-			v.IsResearchPoints = false
-		}
 	}
 
 	// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包
@@ -604,7 +600,9 @@ func (this *ActivityController) ActivityListNew() {
 	if len(activityList) == 0 {
 		activityList = make([]*models.ActivityListResp, 0)
 	}
-
+	if activityTypeId == "3" || activityTypeId == "5" {
+		resp.IsShowResearchPoints = true
+	}
 	//预处理返给前端的字段
 	resp.List = activityList
 	resp.Paging = page

models/activity.go

@@ -370,6 +370,7 @@ type GetCygxActivityListRep struct {
 	IndustrialManagementId int    `description:"产业ID"`
 	IndustryNewLabel       bool   `description:"产业是否新标签"`
 	ChartPermissionId      int    `description:"权限id"`
+	IsShowResearchPoints   bool   `description:"是否展示研选扣点搜索"`
 }
 
 type GetCygxActivityListSearchResp struct {