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

变更数据



查看合并请求 !3316

@@ -225,7 +225,7 @@ class AsideTicketController extends BaseController
                 }
                 }
                 $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();
                 $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();
                 if(!empty($projectIds)){
                 if(!empty($projectIds)){
-                    return $query->whereIn('table_id', $projectV6Ids);
+                    return $query->orWhereIn('table_id', $projectV6Ids);
                 }
                 }
             })
             })
             ->when(!empty($validated['search']), function ($query) use ($validated) {
             ->when(!empty($validated['search']), function ($query) use ($validated) {