|
@@ -149,7 +149,7 @@ class NoticesService
|
|
$where[] = ['notices.title', 'like', "%" . $title . "%"];
|
|
$where[] = ['notices.title', 'like', "%" . $title . "%"];
|
|
}
|
|
}
|
|
|
|
|
|
- $list = UserNotice::leftJoin('notices', 'notices.id', "user_notice.notice_id")->where($where)->select('notices.id', 'notices.title', 'notices.is_popup', "user_notice.is_read", 'notices.created_at')
|
|
|
|
|
|
+ $list = DB::table('user_notice')->leftJoin('notices', 'notices.id', "user_notice.notice_id")->where($where)->select('notices.id', 'notices.title', 'notices.is_popup', "user_notice.is_read", 'notices.created_at')
|
|
->orderBy('notices.created_at', 'desc')->orderBy('sort', 'desc')->paginate($pageSize);
|
|
->orderBy('notices.created_at', 'desc')->orderBy('sort', 'desc')->paginate($pageSize);
|
|
if (!$list->isEmpty()) {
|
|
if (!$list->isEmpty()) {
|
|
foreach ($list as $val) {
|
|
foreach ($list as $val) {
|