|
|
@@ -2083,9 +2083,15 @@ class NewsService implements NewsServiceInterface
|
|
|
if (isset($data['level']) && !empty($data['level'])) {
|
|
|
$where[] = ['level', '=', $data['level']];
|
|
|
}
|
|
|
+ //status
|
|
|
+ if (isset($data['status']) && !empty($data['status'])) {
|
|
|
+ $where[] = ['status', '=', $data['status']];
|
|
|
+ }
|
|
|
var_dump($data['type_id'], '-----------------test---------');
|
|
|
if ($data['type_id'] == 10000) {
|
|
|
- $result = Notice::where('status', 1)
|
|
|
+ $result = Notice::when(!empty($data['status1']), function ($query) use ($data) {
|
|
|
+ return $query->whereIn('status', [1, 3]); //1待审核2已审核3已拒绝
|
|
|
+ })
|
|
|
->where($where)
|
|
|
->orderBy('updated_at', 'desc')
|
|
|
->limit($data['page_size'])
|
