专项调研活动已结束的默认不展示v3

services/activity_special.go

@@ -58,10 +58,6 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 	}
 
-	if activeState == "1" {
-		condition += `  AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
-	}
-
 	if activeState == "2" {
 		condition += ` AND art.days > 0  AND art.activity_time <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 		condition += ` AND art.activity_time_end >= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
@@ -79,6 +75,11 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		condition += `  AND art.days > 0  `
 	}
 
+	if activeState == "1" {
+		conditionor := " OR  ( art.days = 0 )  " + condition
+		condition = condition + `  AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '" + conditionor
+	}
+
 	return
 }