diff --git a/app/Http/Controllers/Client/kb/UserController.php b/app/Http/Controllers/Client/kb/UserController.php index 08d19edad..b80a9d2e4 100644 --- a/app/Http/Controllers/Client/kb/UserController.php +++ b/app/Http/Controllers/Client/kb/UserController.php @@ -38,11 +38,13 @@ class UserController extends Controller { public function getArticle(Article $article, Category $category, Settings $settings) { $setting = $settings->first(); $pagination = $setting->pagination; - if (\Auth::user()->role == 'user' || !Auth::check()) { + if (!Auth::check() || \Auth::user()->role == 'user') { $article = $article->where('status', '1'); } $article = $article->where('type', '1'); + $article = $article->orderBy('publish_time','desc'); $article = $article->paginate($pagination); + $article->setPath('article-list'); $categorys = $category->get(); return view('themes.default1.client.kb.article-list.articles', compact('time', 'categorys', 'article')); diff --git a/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php b/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php index 47b8dfcfd..08a42ed21 100644 --- a/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php +++ b/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php @@ -35,6 +35,7 @@ class = "active" $article = App\Model\kb\Article::where('id', $id)->get(); $article = $article->where('status', 1); $article = $article->where('type', 1); + $article = $article->orderBy('publish_time','desc'); //dd($article); ?> @foreach($article as $arti)