no message

services/activity_special.go

@@ -57,6 +57,11 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		condition += `    AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
 		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) + " '"
@@ -130,7 +135,6 @@ func GetActivityLabelSpecialList(user *models.WxUserItem, conditionActivitySpeci
 	//	condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `) `
 	//}
 	conditionTrip := condition
-	conditionTrip += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	conditionTrip += ` AND art.days > 0  ORDER BY art.activity_time ASC `
 	specialList, err := models.GetActivityLabelSpecialListAll(conditionTrip, pars, 0, 8)
 	if err != nil {