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