|
@@ -80,34 +80,35 @@ func (this *MicroRoadShowController) List() {
|
|
|
br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
|
|
|
return
|
|
|
}
|
|
|
- var pageSizeIk int
|
|
|
-
|
|
|
- //获取总的数量
|
|
|
- totalIk, e := services.CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds)
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取微路演联想词列表失败, Err: " + e.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- pageSizeIk = totalIk - len(list)
|
|
|
- //处理IK分词部分的分页获取条数
|
|
|
- startSizeIk := utils.StartIndex(currentIndex, pageSize)
|
|
|
- startSizeIk = startSizeIk - total
|
|
|
- if startSizeIk < 0 {
|
|
|
- startSizeIk = 0
|
|
|
- }
|
|
|
- if pageSizeIk > 0 {
|
|
|
- lisIk, e := services.GetMicroRoadShowPageListIkWord(startSizeIk, pageSizeIk, audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds, keywords)
|
|
|
+ if keywords != "" {
|
|
|
+ var pageSizeIk int
|
|
|
+ //获取总的数量
|
|
|
+ totalIk, e := services.CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds)
|
|
|
if e != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
|
|
|
+ br.ErrMsg = "获取微路演联想词列表失败, Err: " + e.Error()
|
|
|
return
|
|
|
}
|
|
|
- for _, item := range lisIk {
|
|
|
- list = append(list, item)
|
|
|
+ pageSizeIk = totalIk - len(list)
|
|
|
+ //处理IK分词部分的分页获取条数
|
|
|
+ startSizeIk := utils.StartIndex(currentIndex, pageSize)
|
|
|
+ startSizeIk = startSizeIk - total
|
|
|
+ if startSizeIk < 0 {
|
|
|
+ startSizeIk = 0
|
|
|
+ }
|
|
|
+ if pageSizeIk > 0 {
|
|
|
+ lisIk, e := services.GetMicroRoadShowPageListIkWord(startSizeIk, pageSizeIk, audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds, keywords)
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for _, item := range lisIk {
|
|
|
+ list = append(list, item)
|
|
|
+ }
|
|
|
}
|
|
|
+ total = totalIk
|
|
|
}
|
|
|
- total = totalIk
|
|
|
userId := user.UserId
|
|
|
listMycollect, err := models.GetUserMicroRoadshowCollectList(userId)
|
|
|
if err != nil {
|