主题列表排序修改

controllers/activity.go

@@ -1670,6 +1670,7 @@ func (this *ActivityCoAntroller) LabelList() {
 	pageSize = 16
 	//startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
+	var sortTime string
 	var pars []interface{}
 	//活动可见限制
 	var sqlExport string
@@ -1703,14 +1704,15 @@ func (this *ActivityCoAntroller) LabelList() {
 	//conditionLaable := condition
 	//主题
 	if label != "" {
-
-		listAll, errList := models.GetActivityLabelListAll(condition, pars, startSize, 32)
+		sortTime = ` timesort DESC `
+		listAll, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, 32)
 		if errList != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + errList.Error()
 			return
 		}
-		list1, errList := models.GetActivityLabelListAll(condition, pars, startSize, 16)
+		condition += ` AND art.active_state = 1 `
+		list1, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, 16)
 		if errList != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + errList.Error()
@@ -1773,7 +1775,8 @@ func (this *ActivityCoAntroller) LabelList() {
 		conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + `) `
 		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
 	}
-	list, errList := models.GetActivityLabelListAll(condition, pars, startSize, pageSize)
+	sortTime = ` mintimesort ASC `
+	list, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
 	if errList != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + errList.Error()

models/activity.go

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