|
|
@@ -1779,9 +1779,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
|
|
|
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 {
|
xingzai