no message

controllers/activity.go

@@ -1683,6 +1683,7 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 // @Param   TypeName   query   string  false       "电话会类型 ，1专家电话会 2分析师电话会"
 // @Param   IsExternalLabel   query   int  false       "是否仅展示外部资源 1：是、0：否 默认0"
 // @Param   IsResearchPoints   query   string  false       "是否仅展示研选扣点 1：展示研选扣点、2：展示外部资源 ，1,2两者都展示" //兼容前端
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} models.GetCygxActivityListRep
 // @router /listNew [get]
 func (this *ActivityCoAntroller) ActivityListNew() {
@@ -1715,7 +1716,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	activityId, _ := this.GetInt("ActivityId") // 仅用于判断【新】标签
 	//isExternalLabel, _ := this.GetInt("IsExternalLabel")   //
 	isResearchPoints := this.GetString("IsResearchPoints") //
-
+	isResearch, _ := this.GetBool("IsResearch", false)     // 是否为研选 查研观向11.0 （研选活动独立显示）
 	if label == "undefined" {
 		label = ""
 	}
@@ -1755,6 +1756,11 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	if label != "" {
 		conditioninit += ` AND art.label  LIKE "%` + label + `%" `
 	}
+	if isResearch {
+		chartPermissionIds = strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)
+	} else {
+		//condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
+	}
 	//行业名称
 	if len(chartPermissionIds) > 0 {
 		conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`

services/activity.go

@@ -2221,6 +2221,9 @@ func DoActivityOnenIdWxTemplateMsg(cont context.Context) (err error) {
 }
 
 func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.ActivityDetail) {
+	if item.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+		item.IsResearch = true
+	}
 	articleDetail = item
 	//IsShowAppointment       bool                       `description:"是否展示预约纪要"`
 	//IsShowOutboundCall      bool                       `description:"是否展示预约外呼"`