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