no message

controllers/activity.go

@@ -1783,9 +1783,12 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 
 		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 {
-		conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+		//conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+		conditioninit += `  AND IF ( art.yidong_activity_id != '' , art.chart_permission_id_deputy  IN (` + chartPermissionIds + `) ,1=1 ) `
+		conditioninit += `  AND IF ( art.yidong_activity_id = '' , art.chart_permission_id  IN (` + chartPermissionIds + `) ,1=1 ) `
 	}
 	//哪一天
 	if whichDay != "" {
@@ -2288,8 +2291,11 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		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 {
-		conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+		//conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+		conditioninit += `  AND IF ( art.yidong_activity_id != '' , art.chart_permission_id_deputy  IN (` + chartPermissionIds + `) ,1=1 ) `
+		conditioninit += `  AND IF ( art.yidong_activity_id = '' , art.chart_permission_id  IN (` + chartPermissionIds + `) ,1=1 ) `
 	}
 	//哪一天
 	if whichDay != "" {