合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3314

@@ -216,7 +216,7 @@ class AsideTicketController extends BaseController
                 }
                 }
             })
             })
             //待审核项目列表
             //待审核项目列表
-            ->when(!empty($validated['pending_review']), function ($query) use ($validated) {
+            ->when(!empty($this->param['pending_review']), function ($query) use ($validated) {
                 // 查找项目名称或公司名称
                 // 查找项目名称或公司名称
                 $ticketUploadModel = new TicketUploadData();
                 $ticketUploadModel = new TicketUploadData();
                 $projectIds = $ticketUploadModel->where('status', 0)->distinct('project_id')->pluck('project_id')->toArray();
                 $projectIds = $ticketUploadModel->where('status', 0)->distinct('project_id')->pluck('project_id')->toArray();