xingzai пре 2 година
родитељ
комит
03928dd773
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1 1
      services/activity_special.go

+ 1 - 1
services/activity_special.go

@@ -66,7 +66,7 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		condition += `   AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	}
 
-	if activeState == "" {
+	if activeState == "" && whichDay == "" {
 		condition += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	}