|
@@ -2065,6 +2065,7 @@ class NewsService implements NewsServiceInterface
|
|
|
$query->whereIn('zwid', $zwids);
|
|
$query->whereIn('zwid', $zwids);
|
|
|
})
|
|
})
|
|
|
->where('zwpid', 0)
|
|
->where('zwpid', 0)
|
|
|
|
|
+ ->orderBy('updated_at', 'desc')
|
|
|
->offset(($page - 1) * $page_size)
|
|
->offset(($page - 1) * $page_size)
|
|
|
->limit($page_size)->get()
|
|
->limit($page_size)->get()
|
|
|
->map(function ($item) use ($data) {
|
|
->map(function ($item) use ($data) {
|
|
@@ -2072,6 +2073,7 @@ class NewsService implements NewsServiceInterface
|
|
|
->when(!empty($data['childname']), function ($query) use ($data) {
|
|
->when(!empty($data['childname']), function ($query) use ($data) {
|
|
|
$query->where('zwname', 'like', '%' . $data['childname'] . '%');
|
|
$query->where('zwname', 'like', '%' . $data['childname'] . '%');
|
|
|
})
|
|
})
|
|
|
|
|
+ ->orderBy('updated_at', 'desc')
|
|
|
->get();
|
|
->get();
|
|
|
return $item;
|
|
return $item;
|
|
|
})
|
|
})
|
