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

变更数据



查看合并请求 !3320

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