fix

controllers/activity.go

@@ -4878,7 +4878,7 @@ func (this *ActivityCoAntroller) OverActivityList() {
 
 	//已结束的活动
 	sortTime = ` timesort DESC `
-	list, err := models.GetActivityLabelListAll(condition, sortTime, pars)
+	list, err := models.GetActivityLabelListAllNoLimit(condition, sortTime, pars)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

models/activity.go

@@ -627,16 +627,16 @@ type CygxActivityLabelList struct {
 }
 
 //主题列表
-func GetActivityLabelListAll(condition, sortTime string, pars []interface{}) (items []*CygxActivityLabelList, err error) {
+func GetActivityLabelListAll(condition, sortTime string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT	activity_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id 
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY art.label ORDER BY ` + sortTime + ` ,art.activity_id DESC `
+	sql += ` GROUP BY art.label ORDER BY ` + sortTime + ` ,art.activity_id DESC  LIMIT ?,? `
 
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
 
@@ -947,3 +947,17 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 	_, err = o.Raw(sql, pars, uid, uid, uid, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+//主题列表
+func GetActivityLabelListAllNoLimit(condition, sortTime string, pars []interface{}) (items []*CygxActivityLabelList, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT	activity_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id 
+		FROM cygx_activity as art WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` GROUP BY art.label ORDER BY ` + sortTime + ` ,art.activity_id DESC `
+
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}