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

Lyh server



查看合并请求 !3315

@@ -219,10 +219,14 @@ class AsideTicketController extends BaseController
             ->when(!empty($this->param['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)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray();
                 if(!empty($projectIds)){
                 if(!empty($projectIds)){
                     return $query->whereIn('post_id', $projectIds);
                     return $query->whereIn('post_id', $projectIds);
                 }
                 }
+                $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();
+                if(!empty($projectIds)){
+                    return $query->whereIn('table_id', $projectV6Ids);
+                }
             })
             })
             ->when(!empty($validated['search']), function ($query) use ($validated) {
             ->when(!empty($validated['search']), function ($query) use ($validated) {
                 // 查找项目名称或公司名称
                 // 查找项目名称或公司名称