wesmiler 报恩寺项目提交

app/Services/ArticleService.php

@@ -148,11 +148,6 @@ class ArticleService extends BaseService
             ->where(function ($query) use ($params) {
                 $query->where(['a.mark'=>1,'a.status'=> 1]);
 
-                $keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
-                if (!empty($keyword)) {
-                    $query->where('a.title', 'like', "%{$keyword}%");
-                }
-
                 $cateId = isset($params['cate_id']) ? intval($params['cate_id']) : 0;
                 if ($cateId > 0) {
                     $query->where('a.cate_id', $cateId);
@@ -171,6 +166,12 @@ class ArticleService extends BaseService
                 }
 
             })
+            ->where(function($query) use($params){
+                $keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
+                if (!empty($keyword)) {
+                    $query->where('a.title', 'like', "%{$keyword}%")->orWhere('c.name','like',"%{$keyword}%");
+                }
+            })
             ->select(['a.id', 'a.cate_id', 'c.name as cate_name', 'a.title', 'a.is_form', 'a.is_recommand', 'a.view_num', 'a.thumb', 'a.status', 'a.create_time', 'a.update_time', 'a.description', 'a.sort','a.publish_at'])
             ->orderBy('a.update_time', 'desc')
             ->paginate($pageSize);