|
@@ -160,6 +160,11 @@ class ArticleService extends BaseService
|
|
|
$query->where('a.is_top', $isTop);
|
|
$query->where('a.is_top', $isTop);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ $userId = isset($params['user_id']) ? intval($params['user_id']) : 0;
|
|
|
|
|
+ if ($userId > 0) {
|
|
|
|
|
+ $query->where('a.user_id', $userId);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$type = isset($params['type']) ? intval($params['type']) : 0;
|
|
$type = isset($params['type']) ? intval($params['type']) : 0;
|
|
|
if ($type > 0) {
|
|
if ($type > 0) {
|
|
|
$query->where('a.type', $type);
|
|
$query->where('a.type', $type);
|
|
@@ -172,7 +177,7 @@ class ArticleService extends BaseService
|
|
|
$query->where('a.title', 'like', "%{$keyword}%")->orWhere('c.name','like',"%{$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'])
|
|
|
|
|
|
|
+ ->select(['a.id', 'a.cate_id', 'c.name as cate_name','a.author', '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.sort', 'desc')
|
|
->orderBy('a.sort', 'desc')
|
|
|
->orderBy('a.update_time', 'desc')
|
|
->orderBy('a.update_time', 'desc')
|
|
|
->paginate($pageSize);
|
|
->paginate($pageSize);
|