进行中的活动展示在最上面

controllers/activity.go

@@ -2783,8 +2783,36 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	//userType, permissionStr, err := services.GetUserType(user.CompanyId)
 	var condition string
 	var pars []interface{}
-	//活动可见限制
+	var activityList []*models.ActivityDetail
+	mapDingActivityId := make(map[int]int)
+	//进行中的活动拍在最上面
+	if keyWord != "" {
+		conditionActivity, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, strconv.Itoa(2), label, 0, source, keyWord)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
+			return
+		}
+		if source == 1 {
+			condition += ` AND art.yidong_activity_id = '' `
+		}
+		condition += ` AND art.is_limit_people = 1 AND art.publish_status = 1 ` + conditionActivity
+		condition += ` ORDER BY art.activity_time ASC   `
+		listDing, err := models.GetActivityListAll(condition, pars, uid, startSize, pageSize, playBack)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
+			return
+		}
+		if len(listDing) > 0 {
+			for _, v := range listDing {
+				activityList = append(activityList, v)
+				mapDingActivityId[v.ActivityId] = v.ActivityId
+			}
+		}
+	}
 
+	//活动可见限制
 	conditionActivity, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
@@ -2909,7 +2937,13 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error()
 		return
 	}
-	for k, v := range list {
+	for _, v := range list {
+		if mapDingActivityId[v.ActivityId] == 0 {
+			activityList = append(activityList, v)
+		}
+	}
+
+	for k, v := range activityList {
 		if mapActivityVoice[v.ActivityId] != nil {
 			list[k].AudioLink = true
 			list[k].VoiceList = mapActivityVoice[v.ActivityId]