Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_4.0

services/activity_special.go

@@ -77,8 +77,9 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 	condition += `  AND art.label != ''  AND art.is_offline = 0   `
 
 	if activeState == "1" {
-		conditionor := " OR  ( art.days = 0 )  " + condition
-		condition = condition + `  AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '" + conditionor
+		//conditionor := " OR  ( art.days = 0 " + condition + " )  "
+		conditionor := ""
+		condition = condition + ` AND ( art.days > 0    AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " ' OR  ( art.days = 0 ) )" + conditionor
 	}
 
 	return