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

变更数据



查看合并请求 !3312

@@ -132,7 +132,9 @@ class AsideTicketController extends BaseController
         if(isset($this->param['pending_review']) && $this->param['pending_review'] == 1){
         if(isset($this->param['pending_review']) && $this->param['pending_review'] == 1){
             $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();
-            $query->whereIn('post_id', $projectIds);
+            return $query->whereHas('project', function ($q) use ($projectIds) {
+                $q->whereIn('post_id', $projectIds);
+            });
         }
         }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
             $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
             $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);