|
@@ -201,7 +201,7 @@ func GetActivityListByDateTime(startDate, endDate, activityIds string) (items []
|
|
|
sql := `SELECT * FROM cygx_activity WHERE activity_time > '` + startDate + `' AND activity_time < '` + endDate + `' `
|
|
|
activityIds = strings.TrimRight(activityIds, ",")
|
|
|
if activityIds != "" {
|
|
|
- sql += ` AND activity_id NOT IN (` + activityIds + `) `
|
|
|
+ sql += ` AND activity_id NOT IN (` + activityIds + `) OR activity_id IN (SELECT config_value FROM cygx_config WHERE config_code = 'jin_meng_activity_id')`
|
|
|
}
|
|
|
_, err = o.Raw(sql).QueryRows(&items)
|
|
|
return
|