|
@@ -15,7 +15,7 @@ class SiteAlbum extends EloquentRepository
|
|
|
protected $eloquentClass = Model::class;
|
|
|
|
|
|
|
|
|
- public static function siteAlbumPaginate($filter = [],$perPage = 15,$page = 1)
|
|
|
+ public static function siteAlbumPaginate($filter = [],$sort = [],$perPage = 15,$page = 1)
|
|
|
{
|
|
|
$siteAlbum = new Model();
|
|
|
$filterModel = isset($filter['model'])? $filter['model'] : '';
|
|
@@ -31,6 +31,11 @@ class SiteAlbum extends EloquentRepository
|
|
|
|
|
|
$siteAlbum = $siteAlbum->whereIn('folder_id', $albumFolder);
|
|
|
}
|
|
|
+ if (empty($sort)) {
|
|
|
+ $siteAlbum = $siteAlbum->orderBy('id', 'desc');
|
|
|
+ } else {
|
|
|
+ $siteAlbum = $siteAlbum->orderBy($sort[0], $sort[1]);
|
|
|
+ }
|
|
|
|
|
|
$result = $siteAlbum->paginate(
|
|
|
$perPage, $columns = ['*'], $pageName = 'page', $page
|