no message

controllers/activity.go

@@ -270,7 +270,9 @@ func (this *ActivityNoLoginController) ActivityListNew() {
 
 	//行业名称
 	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 != "" {