|
@@ -5515,7 +5515,7 @@ class NewsService implements NewsServiceInterface
|
|
|
$q->whereRaw("DATE_FORMAT(showtime, '%m') = ?", [$month])
|
|
|
->whereRaw("DATE_FORMAT(showtime, '%d') >= ?", [$day]);
|
|
|
});
|
|
|
- })->orderByRaw("DATE_FORMAT(showtime, '%m') ASC, DATE_FORMAT(year, '%d') ASC, year ASC");
|
|
|
+ })->orderByRaw("DATE_FORMAT(showtime, '%m') ASC, DATE_FORMAT(showtime, '%d') ASC, showtime ASC");
|
|
|
$total = $query->count();
|
|
|
$result = $query->select("title", "id","updated_at", "showtime", DB::raw('2 as type'))
|
|
|
->offset(($page - 1) * $pageSize)
|