no message

controllers/activity.go

@@ -66,7 +66,8 @@ func (this *ActivityNoLoginController) LabelTypeList() {
 	if isResearch {
 		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) + `')  )`
+		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 )` // 研选活动结束后就不在已结束页面展示了
 	}
 	//行业名称
 	if len(chartPermissionIds) > 0 {
@@ -264,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 ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `' AND art.active_state  != 3 )` // 研选活动结束后就不在已结束页面展示了
 	}
 
 	//行业名称
@@ -402,7 +403,7 @@ func (this *ActivityNoLoginController) ActivityListNew() {
 		conditionOrder = ` ORDER BY art.activity_time ASC  `
 	}
 	//未开始进行中默认按照时间正序
-	if activeState == "1" || activeState == "1,2" {
+	if activeState == "1" || activeState == "1,2" || activeState == "" {
 		conditionOrder = ` ORDER BY art.activity_time ASC  `
 	}