合并分支 'workorder' 到 'master'

status



查看合并请求 !2098

@@ -35,8 +35,10 @@ class WorkOrderController extends BaseController
                 });
                 });
             })
             })
             ->when($request->input('status') !== null, function ($query) use ($request) {
             ->when($request->input('status') !== null, function ($query) use ($request) {
-                // status 查 WorkOrderLog
-                return $query->where('status', $request->input('status'));
+                // status 查 workOrder
+                return $query->whereHas('workOrder', function ($q) use ($request) {
+                    $q->where('status', $request->input('status'));
+                });
             })
             })
             ->when($request->input('search'), function ($query) use ($request) {
             ->when($request->input('search'), function ($query) use ($request) {
                 // search 查 workOrder
                 // search 查 workOrder