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

变更数据



查看合并请求 !3313

@@ -128,14 +128,6 @@ 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();
-            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']]);
         }
         }
@@ -223,6 +215,15 @@ class AsideTicketController extends BaseController
                     return $query->where('id', 0); // 返回空结果
                     return $query->where('id', 0); // 返回空结果
                 }
                 }
             })
             })
+            //待审核项目列表
+            ->when(!empty($validated['pending_review']), function ($query) use ($validated) {
+                // 查找项目名称或公司名称
+                $ticketUploadModel = new TicketUploadData();
+                $projectIds = $ticketUploadModel->where('status', 0)->distinct('project_id')->pluck('project_id')->toArray();
+                if(!empty($projectIds)){
+                    return $query->whereIn('post_id', $projectIds);
+                }
+            })
             ->when(!empty($validated['search']), function ($query) use ($validated) {
             ->when(!empty($validated['search']), function ($query) use ($validated) {
                 // 查找项目名称或公司名称
                 // 查找项目名称或公司名称
                 $search = $validated['search'];
                 $search = $validated['search'];