|
@@ -325,11 +325,12 @@ class NewsService implements NewsServiceInterface
|
|
|
'status' => 1,
|
|
|
'catid' => $catid
|
|
|
];
|
|
|
- if($data['level']==1){
|
|
|
- $level=[
|
|
|
- 0=>'1',
|
|
|
- 1=>'4',
|
|
|
- 2=>'5'
|
|
|
+ if ($data['level'] == 1) {
|
|
|
+ $level = [
|
|
|
+ 0 => '1',
|
|
|
+ 1 => '4',
|
|
|
+ 2 => '5',
|
|
|
+ 3 => '0',
|
|
|
];
|
|
|
$result = Article::where($where)->whereIn('level',$level)->orderBy("created_at","desc")->limit($data['pagesize'])->get();
|
|
|
}elseif($data['level']==2){
|
|
@@ -379,8 +380,7 @@ class NewsService implements NewsServiceInterface
|
|
|
*/
|
|
|
public function getWebsiteArticleList(array $data): array
|
|
|
{
|
|
|
- $where= [];
|
|
|
-
|
|
|
+ $where[] = ['status', '=', 1];
|
|
|
if(isset($data['keyword']) && !empty($data['keyword'])){
|
|
|
array_push($where,['article.title','like','%'.$data['keyword'].'%']);
|
|
|
}
|
|
@@ -391,7 +391,6 @@ class NewsService implements NewsServiceInterface
|
|
|
}
|
|
|
array_push($where,['catid',$data['catid']]);
|
|
|
}
|
|
|
-
|
|
|
$rep = Article::where($where)
|
|
|
->orderBy("created_at","desc")
|
|
|
->limit($data['pageSize'])
|