no message

models/activity.go

@@ -279,7 +279,7 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 		sql += condition
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, uid, uid, uid, startSize, pageSize).QueryRows(&items)
+	_, err = o.Raw(sql, uid, uid, uid, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
 

services/resource_data.go

@@ -95,17 +95,19 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		for _, vss := range activityIds {
 			imgUrlResp += strconv.Itoa(vss) + ","
 		}
+		fmt.Println(imgUrlResp)
 		pars = make([]interface{}, 0)
-		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)`
+		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)   `
 		pars = append(pars, activityIds)
 		activityList, e := models.GetActivityListNew(condition, pars, uid, startSize, len(activityIds), 0, 0)
 		if e != nil {
 			err = errors.New("GetResourceDataList, Err: " + e.Error())
 			return
 		}
+		fmt.Println(len(activityList), "activityList")
+
 		var activityListRersp []*models.ActivityListResp
 		for _, v := range activityList {
-
 			activityListRersp = append(activityListRersp, ActivityButtonShow(v, user))
 		}
 		for _, v := range activityListRersp {
@@ -249,10 +251,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
 			return
 		}
-		fmt.Println(activityVideoList, "activityVideoList")
-		fmt.Println(videoMap)
 		for _, v := range activityVideoList {
-			fmt.Println(v)
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
@@ -313,8 +312,12 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			}
 		}
 	}
-	for _, v := range mapItems {
-		items = append(items, v)
+	for _, vList := range list {
+		for _, v := range mapItems {
+			if v.SourceId == vList.SourceId {
+				items = append(items, v)
+			}
+		}
 	}
 	return
 }