|
@@ -38,7 +38,7 @@ class Notice extends BaseController {
|
|
|
if ($this->request->isAjax()) {
|
|
|
$pageSize = $this->request->param("pageSize") ?: 6;
|
|
|
$page = $this->request->param("page") ?: 1;
|
|
|
- $list = NoticeModel::where('batch','null')->order(["isTop", "topTime" => "desc", "createTime" => "desc"])->page($page, $pageSize)->select();
|
|
|
+ $list = NoticeModel::where('batch', 'null')->whereOr('batch', "")->order(["isTop", "topTime" => "desc", "createTime" => "desc"])->page($page, $pageSize)->select();
|
|
|
return json($list);
|
|
|
}
|
|
|
}
|