From 68a29ca98418bb8a892fa2df186d0924df9ffed6 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Fri, 21 Feb 2025 14:33:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=86=E9=A2=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/v1/Video.php | 2 ++ app/admin/controller/v1/VideoCategory.php | 1 + app/admin/controller/v1/VideoTrash.php | 1 + app/admin/model/v1/VideoCategoryModel.php | 6 ++++++ app/admin/model/v1/VideoModel.php | 6 ++++++ 5 files changed, 16 insertions(+) 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) {