no message

controllers/activity.go

@@ -67,11 +67,7 @@ func (this *ActivityNoLoginController) LabelTypeList() {
 		chartPermissionIds = strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)
 	} else {
 		conditioninit += ` AND ( art.chart_permission_id  !=  ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `  OR  ( art.is_show_hz = 1 AND art.chart_permission_id  =  ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `)  )`
-
-		if activeState == "3" {
-			conditioninit += ` AND  art.chart_permission_id  !=  ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) //V 11.0 研选活动结束后就不在已结束页面展示了
-		}
-
+		conditioninit += ` AND IF (	 art.active_state = 3, art.chart_permission_id != ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `, 1 = 1 ) ` //V 11.0 研选活动结束后就不在已结束页面展示了
 	}
 	//行业名称
 	if len(chartPermissionIds) > 0 {
@@ -269,7 +265,7 @@ func (this *ActivityNoLoginController) ActivityListNew() {
 	} else {
 		conditioninit += ` AND ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'  OR  ( art.is_show_hz = 1 AND art.chart_permission_id  =  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `')  )`
 
-		conditioninit += ` AND ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `' AND art.active_state  != 3 )` // 研选活动结束后就不在已结束页面展示了
+		conditioninit += ` AND IF (	 art.active_state = 3, art.chart_permission_id != ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `, 1 = 1 ) ` //V 11.0 研选活动结束后就不在已结束页面展示了
 	}
 
 	//行业名称
@@ -2048,9 +2044,9 @@ func (this *ActivityController) ActivityListSearch() {
 		list = make([]*models.CygxResourceDataResp, 0)
 	}
 	//添加活动搜索记录
-	if keyWord != "" {
-		//go services.AddActivitykeyWordSearch(keyWord, user)
-	}
+	//if keyWord != "" {
+	//go services.AddActivitykeyWordSearch(keyWord, user)
+	//}
 	resp.Paging = page
 	resp.List = list
 	br.Ret = 200

services/activity.go

@@ -706,6 +706,12 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 				activityDetail.IsShowSignup = true
 				activityDetail.IsShowMeetingReminder = true
 			}
+
+			//买方线下交流 8 // 查研观向 11.0
+			if activityDetail.ActivityTypeId == 8 {
+				activityDetail.IsShowSignup = true
+			}
+
 			//如果是易董创建的活动，展示我要报名，不展示预约外呼
 			if activityDetail.IsYidongConduct {
 				activityDetail.IsShowSignup = true

services/activity_button.go

@@ -395,6 +395,11 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 				activityDetail.IsShowSignup = true
 				activityDetail.IsShowMeetingReminder = true
 			}
+
+			//买方线下交流 8 // 查研观向 11.0
+			if activityDetail.ActivityTypeId == 8 {
+				activityDetail.IsShowSignup = true
+			}
 		}
 	}
 	return