|
@@ -65,7 +65,7 @@ class VideoService extends BaseService
|
|
|
$field = $field? $field : 'lev_a.*';
|
|
$field = $field? $field : 'lev_a.*';
|
|
|
$order = 'lev_a.id desc';
|
|
$order = 'lev_a.id desc';
|
|
|
$sortType = isset($params['sort_type']) ? $params['sort_type'] : 0;
|
|
$sortType = isset($params['sort_type']) ? $params['sort_type'] : 0;
|
|
|
- $list = $this->model->with(['member'])->from('video as a')
|
|
|
|
|
|
|
+ $list = $this->model->with(['member'])->from('videos as a')
|
|
|
->leftJoin('member as b', 'b.id', '=', 'a.user_id')
|
|
->leftJoin('member as b', 'b.id', '=', 'a.user_id')
|
|
|
->where($where)
|
|
->where($where)
|
|
|
->where(function ($query) use ($params) {
|
|
->where(function ($query) use ($params) {
|
|
@@ -142,7 +142,7 @@ class VideoService extends BaseService
|
|
|
$where = ['a.mark' => 1,'a.status'=>2,'b.mark'=>1];
|
|
$where = ['a.mark' => 1,'a.status'=>2,'b.mark'=>1];
|
|
|
$field = $field? $field : 'lev_a.*';
|
|
$field = $field? $field : 'lev_a.*';
|
|
|
$order = 'rand()';
|
|
$order = 'rand()';
|
|
|
- $model = $this->model->with(['member'])->from('video as a')
|
|
|
|
|
|
|
+ $model = $this->model->with(['member'])->from('videos as a')
|
|
|
->leftJoin('member as b', 'b.id', '=', 'a.user_id')
|
|
->leftJoin('member as b', 'b.id', '=', 'a.user_id')
|
|
|
->where($where)
|
|
->where($where)
|
|
|
->where(function ($query) use ($params) {
|
|
->where(function ($query) use ($params) {
|
|
@@ -251,7 +251,7 @@ class VideoService extends BaseService
|
|
|
public function getInfo($id, $userId=0, $field=[])
|
|
public function getInfo($id, $userId=0, $field=[])
|
|
|
{
|
|
{
|
|
|
$field = $field? $field : ['a.*'];
|
|
$field = $field? $field : ['a.*'];
|
|
|
- $info = $this->model->from('video as a')->with(['member'])
|
|
|
|
|
|
|
+ $info = $this->model->from('videos as a')->with(['member'])
|
|
|
->leftJoin('member as b','b.id','=','a.user_id')
|
|
->leftJoin('member as b','b.id','=','a.user_id')
|
|
|
->where(['a.id'=> $id,'a.mark'=>1,'b.mark'=>1])
|
|
->where(['a.id'=> $id,'a.mark'=>1,'b.mark'=>1])
|
|
|
->select($field)
|
|
->select($field)
|
