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

变更数据



查看合并请求 !3311

@@ -10,6 +10,7 @@ use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
 use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
 use App\Models\Manage\Manage;
 use App\Models\Manage\ManageHr;
+use App\Models\Ticket\TicketUploadData;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
@@ -127,6 +128,12 @@ class AsideTicketController extends BaseController
                 });
             }
         }
+        //待审核项目列表
+        if(isset($this->param['pending_review']) && $this->param['pending_review'] == 1){
+            $ticketUploadModel = new TicketUploadData();
+            $projectIds = $ticketUploadModel->where('status', 0)->distinct('project_id')->pluck('project_id')->toArray();
+            $query->whereIn('post_id', $projectIds);
+        }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
             $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
         }