xingzai 3 роки тому
батько
коміт
c8f45cd71d
1 змінених файлів з 2 додано та 1 видалено
  1. 2 1
      models/activity.go

+ 2 - 1
models/activity.go

@@ -201,8 +201,9 @@ 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 + `)  OR activity_id IN (SELECT config_value FROM cygx_config WHERE config_code = 'jin_meng_activity_id')`
+		sql += ` AND activity_id  NOT IN (` + activityIds + `) `
 	}
+	sql += `  OR activity_id IN (SELECT config_value FROM cygx_config WHERE config_code = 'jin_meng_activity_id')`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }