|
@@ -181,8 +181,9 @@ class VideoService extends BaseService
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
// 推荐的数据
|
|
// 推荐的数据
|
|
|
|
|
+ $uids = [];
|
|
|
$countModel = clone $model;
|
|
$countModel = clone $model;
|
|
|
- $total = $countModel->where(function($query) use($params, $userId){
|
|
|
|
|
|
|
+ $total = $countModel->where(function($query) use($params, $userId, &$uids){
|
|
|
// 推荐视频数据
|
|
// 推荐视频数据
|
|
|
$isRecommend = isset($params['is_recommend']) ? $params['is_recommend'] : 0;
|
|
$isRecommend = isset($params['is_recommend']) ? $params['is_recommend'] : 0;
|
|
|
if ($isRecommend > 0) {
|
|
if ($isRecommend > 0) {
|
|
@@ -209,6 +210,7 @@ class VideoService extends BaseService
|
|
|
if($total > 3){
|
|
if($total > 3){
|
|
|
// 关联推荐数据
|
|
// 关联推荐数据
|
|
|
$list = $countModel->selectRaw($field)
|
|
$list = $countModel->selectRaw($field)
|
|
|
|
|
+ ->orderByRaw($uids?DB::raw("FIND_IN_SET(user_id,'".implode(',', $uids)."')"):'lev_a.create_time desc')
|
|
|
->orderByRaw($order)
|
|
->orderByRaw($order)
|
|
|
->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
|
}else{
|
|
}else{
|
