diff --git a/app/admin/controller/v1/Video.php b/app/admin/controller/v1/Video.php index afad6f44..8c31ad60 100644 --- a/app/admin/controller/v1/Video.php +++ b/app/admin/controller/v1/Video.php @@ -43,6 +43,7 @@ class Video 'name' => $params['name'] ?? null, 'created_at' => !empty($params['created_at']) ? explode(",", $params['created_at']) : null ]) + ->language(request()->lang_id) ->categoryId($params['category_id'] ?? null) ->order(['sort' => 'desc', 'id' => 'desc']) ->paginate([ @@ -220,6 +221,7 @@ class Video 'name' => $params['name']??null, 'created_at' => !empty($params['created_at']) ? explode(',', $params['created_at']) : null, ]) + ->language(request()->lang_id) ->categoryId($params['category_id']??null) ->order(['sort' => 'asc', 'id' => 'desc']) ->select() diff --git a/app/admin/controller/v1/VideoCategory.php b/app/admin/controller/v1/VideoCategory.php index eda70424..3810009b 100644 --- a/app/admin/controller/v1/VideoCategory.php +++ b/app/admin/controller/v1/VideoCategory.php @@ -30,6 +30,7 @@ class VideoCategory ->withSearch(['name'], [ 'name' => $param['name']??null ]) + ->language(request()->lang_id) ->order(['sort' => 'asc', 'id' => 'desc']) ->paginate([ 'list_rows' => $param['size'], diff --git a/app/admin/controller/v1/VideoTrash.php b/app/admin/controller/v1/VideoTrash.php index 612f524b..ad4f7cf3 100644 --- a/app/admin/controller/v1/VideoTrash.php +++ b/app/admin/controller/v1/VideoTrash.php @@ -39,6 +39,7 @@ class VideoTrash ->withSearch(['name'], [ 'name' => $params['name']??null ]) + ->language(request()->lang_id) ->categoryId($params['category_id']??null) ->onlyTrashed() ->order(['sort' => 'asc', 'id' => 'desc']) diff --git a/app/admin/model/v1/VideoCategoryModel.php b/app/admin/model/v1/VideoCategoryModel.php index 727dd060..0ad1941f 100644 --- a/app/admin/model/v1/VideoCategoryModel.php +++ b/app/admin/model/v1/VideoCategoryModel.php @@ -25,4 +25,10 @@ class VideoCategoryModel extends VideoCategoryBaseModel } $query->where('name', 'like', '%' . $value . '%'); } + + // 语言查询 + public function scopeLanguage($query, $value) + { + $query->where('language_id', '=', $value); + } } diff --git a/app/admin/model/v1/VideoModel.php b/app/admin/model/v1/VideoModel.php index ce32ae73..098a21fb 100644 --- a/app/admin/model/v1/VideoModel.php +++ b/app/admin/model/v1/VideoModel.php @@ -49,6 +49,12 @@ class VideoModel extends VideoBaseModel } } + // 语言查询 + public function scopeLanguage($query, $value) + { + $query->where('language_id', '=', $value); + } + // 分类查询 public function scopeCategoryId($query, $value) {