xingzai 1 éve
szülő
commit
36ae5c690f

+ 1 - 1
controllers/micro_roadshow.go

@@ -126,7 +126,7 @@ func (this *MicroRoadShowController) List() {
 		} else if item.VideoId > 0 {
 			mapvideoIds[item.VideoId] = item.VideoId
 		} else if item.ActivityVideoId > 0 {
-			mapactivityVideoIds[item.ActivityVoiceId] = item.ActivityVoiceId
+			mapactivityVideoIds[item.ActivityVideoId] = item.ActivityVideoId
 		}
 	}
 

+ 1 - 1
models/activity_video.go

@@ -137,7 +137,7 @@ func GetCygxActivityVideoByActivityIdInfo(activityId int) (item *CygxActivityVid
 			cygx_activity_video AS v
 			INNER JOIN cygx_activity AS a  ON  v.activity_id = a.activity_id
 		WHERE
-			activity_id = ? 
+			 v.activity_id = ? 
 			LIMIT 1 `
 	err = orm.NewOrm().Raw(sql, activityId).QueryRow(&item)
 	return

+ 1 - 1
services/micro_roadshow.go

@@ -351,7 +351,7 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		case 2:
 			videoAct += ` OR  a.activity_id =  ` + strconv.Itoa(sourceId)
 		case 3:
-			videoMico += ` OR  a.id =  ` + strconv.Itoa(sourceId)
+			videoMico += ` OR  a.video_id =  ` + strconv.Itoa(sourceId)
 		case 4:
 			conditionAskserie += ` OR  a.askserie_video_id =  ` + strconv.Itoa(sourceId)
 		}

+ 1 - 1
services/user.go

@@ -599,7 +599,7 @@ func GetMicroRoadShowMycollectV12(pageSize, currentIndex int, audioIds, activity
 		} else if item.VideoId > 0 {
 			mapvideoIds[item.VideoId] = item.VideoId
 		} else if item.ActivityVideoId > 0 {
-			mapactivityVideoIds[item.ActivityVoiceId] = item.ActivityVoiceId
+			mapactivityVideoIds[item.ActivityVideoId] = item.ActivityVideoId
 		}
 	}