|
|
@@ -1339,6 +1339,22 @@ class NewsService implements NewsServiceInterface
|
|
|
}
|
|
|
if ($data['imgnum'] > 0) {
|
|
|
$query = clone $query;
|
|
|
+ if($data['textnum'] == 0){
|
|
|
+ $query = $query->leftJoinSub(function ($query) use ($website_id) {
|
|
|
+ $query->from('article_ignore')
|
|
|
+ ->where('website_id', $website_id);
|
|
|
+ }, 'article_ignore', function ($join) {
|
|
|
+ $join->on('article_ignore.article_id', '=', 'article.id');
|
|
|
+ })
|
|
|
+ ->where(function ($query) {
|
|
|
+ $query->whereNull('article_ignore.article_id')
|
|
|
+ ->orWhere(function ($subQuery) {
|
|
|
+ $subQuery->whereNotNull('article_ignore.article_id')
|
|
|
+ ->where('article_ignore.is_ignore', 0)
|
|
|
+ ->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'));
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
$result['img'] = $query
|
|
|
->whereIn('catid', $categoryIds)
|
|
|
->where('article.imgurl', '!=', '')
|