合并分支 'workorder' 到 'master'

searh



查看合并请求 !2080

@@ -27,10 +27,10 @@ class WorkOrderController extends BaseController
             'workOrder.logs.manager:id,name',
             'workOrder.logs.manager:id,name',
         ])
         ])
             ->where('manage_id', $this->manage['id'])
             ->where('manage_id', $this->manage['id'])
-            ->when($request->has('status'), function ($query) use ($request) {
+            ->when($request->filled('status'), function ($query) use ($request) {
                 return $query->where('status', $request->input('status'));
                 return $query->where('status', $request->input('status'));
             })
             })
-            ->when($request->has('search'), function ($query) use ($request) {
+            ->when($request->filled('search'), function ($query) use ($request) {
                 return $query->whereHas('workOrder', function ($q) use ($request) {
                 return $query->whereHas('workOrder', function ($q) use ($request) {
                     $q->where('product', 'like', '%' . $request->input('search') . '%')
                     $q->where('product', 'like', '%' . $request->input('search') . '%')
                         ->orWhere('content', 'like', '%' . $request->input('search') . '%');
                         ->orWhere('content', 'like', '%' . $request->input('search') . '%');
@@ -57,10 +57,10 @@ class WorkOrderController extends BaseController
             'engineer:id,name',
             'engineer:id,name',
             'logs.manager:id,name',
             'logs.manager:id,name',
         ])
         ])
-            ->when($request->has('status'), function ($query) use ($request) {
+            ->when($request->filled('status'), function ($query) use ($request) {
                 return $query->where('status', $request->input('status'));
                 return $query->where('status', $request->input('status'));
             })
             })
-            ->when($request->has('search'), function ($query) use ($request) {
+            ->when($request->filled('search'), function ($query) use ($request) {
                 return $query->where('product', 'like', '%' . $request->input('search') . '%')
                 return $query->where('product', 'like', '%' . $request->input('search') . '%')
                     ->orWhere('content', 'like', '%' . $request->input('search') . '%');
                     ->orWhere('content', 'like', '%' . $request->input('search') . '%');
             })
             })
@@ -87,7 +87,7 @@ class WorkOrderController extends BaseController
         if (!$workOrder)
         if (!$workOrder)
             $this->response('工单不存在', Code::USER_MODEL_NOTFOUND_ERROE);
             $this->response('工单不存在', Code::USER_MODEL_NOTFOUND_ERROE);
 
 
-        // TODO 判断是否有查看工单详情权限，待添加
+        // TODO 判断是否有查看工单详情权限，待���加
         $this->response('success', Code::SUCCESS, $workOrder->toArray());
         $this->response('success', Code::SUCCESS, $workOrder->toArray());
     }
     }
 
 
@@ -112,7 +112,7 @@ class WorkOrderController extends BaseController
         }
         }
         $workOrder = $log->workOrder;
         $workOrder = $log->workOrder;
         $result = DB::transaction(function () use ($request, $workOrder, $log) {
         $result = DB::transaction(function () use ($request, $workOrder, $log) {
-            if ($request->has('engineer_ids'))
+            if ($request->filled('engineer_ids'))
             {
             {
                 // 有邀请工程师协同处理
                 // 有邀请工程师协同处理
                 foreach ($request->input('engineer_ids') as $engineer_id)
                 foreach ($request->input('engineer_ids') as $engineer_id)