RPC调用相册系统

app/Admin/Repositories/RpcAlbum.php

@@ -46,7 +46,11 @@ class RpcAlbum extends EloquentRepository
         $currentPage = $model->getCurrentPage();
         // 获取每页显示行数
         $perPage = $model->getPerPage();
-
+        //排序
+        $sort = $model->getSort();
+        if (empty($sort) == true || $sort[0] == null) {
+            $sort = [];
+        }
         // 获取筛选参数
         $filterModel = $model->filter()->input('model', '');
         $folder_id = $model->filter()->input('folder_id', '');
@@ -58,12 +62,11 @@ class RpcAlbum extends EloquentRepository
 
         $result = $this->execute('siteAlbumPaginate', [
             'filter' => $filter,
+            'sort' => $sort,
             'perPage'=>$perPage,
             'page' => $currentPage,
         ]);
 
-
-
         $data = $result['data'] ?? [];
 
         return $model->makePaginator(

app/Distributor/Repositories/RpcAlbum.php

@@ -27,6 +27,7 @@ class RpcAlbum extends EloquentRepository
     {
         $this->initModel($modelOrRelations);
         $distInfo = DistAdminDistributor::getInfo();
+        //可查看的相册目录
         $albumFolder = empty($distInfo->album_folder) ? [] : json_decode($distInfo->album_folder);
         $this->albumFolder = $albumFolder;
     }
@@ -49,7 +50,11 @@ class RpcAlbum extends EloquentRepository
         $currentPage = $model->getCurrentPage();
         // 获取每页显示行数
         $perPage = $model->getPerPage();
-
+        //排序
+        $sort = $model->getSort();
+        if (empty($sort) == true || $sort[0] == null) {
+            $sort = [];
+        }
         // 获取筛选参数
         $filterModel = $model->filter()->input('model', '');
         $folder_id = $model->filter()->input('folder_id', '');
@@ -57,11 +62,12 @@ class RpcAlbum extends EloquentRepository
         $filter = [
             'model' => $filterModel,
             'folder_id' => $folder_id,
-            'album_folder' => $self->albumFolder,
+            'album_folder' => $self->albumFolder,//把查询结果限定在album_folder中
         ];
 
         $result = $this->execute('siteAlbumPaginate', [
             'filter' => $filter,
+            'sort' => $sort,
             'perPage'=>$perPage,
             'page' => $currentPage,
         ]);