我的收藏为空bug处理

controllers/activity.go

@@ -2786,31 +2786,33 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	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
-			}
-		}
-	}
+	//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
+	//		}
+	//	}
+	//	return
+	//	fmt.Println("len", len(listDing))
+	//}
 	condition = ""
 	//活动可见限制
 	conditionActivity, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord)

controllers/user.go

@@ -409,6 +409,17 @@ func (this *UserController) CollectList() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
+	resp := new(models.ArticleReportBillboardLIstPageResp)
+	if len(list) == 0 {
+		page := paging.GetPaging(currentIndex, pageSize, total)
+		resp.List = list
+		resp.Paging = page
+		br.Msg = "获取成功！"
+		br.Ret = 200
+		br.Success = true
+		br.Data = resp
+		return
+	}
 	var condition string
 	var pars []interface{}
 	var articleIds []string
@@ -504,7 +515,6 @@ func (this *UserController) CollectList() {
 		//list[i].SubCategoryName = article.SubCategoryName
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.ArticleReportBillboardLIstPageResp)
 	resp.List = list
 	resp.Paging = page
 	br.Msg = "获取成功！"
@@ -632,6 +642,18 @@ func (this *UserController) BrowseHistoryList() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
+	resp := new(models.ArticleReportBillboardLIstPageResp)
+	if len(list) == 0 {
+		page := paging.GetPaging(currentIndex, pageSize, total)
+		resp.List = list
+		resp.Paging = page
+		br.Msg = "获取成功！"
+		br.Ret = 200
+		br.Success = true
+		br.Data = resp
+		return
+	}
+
 	var articleIds []string
 	var condition string
 	var pars []interface{}
@@ -730,7 +752,7 @@ func (this *UserController) BrowseHistoryList() {
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.ArticleReportBillboardLIstPageResp)
+
 	resp.List = list
 	resp.Paging = page
 	br.Msg = "获取成功！"