合并分支 'workorder' 到 'master'

ok



查看合并请求 !2170

@@ -186,7 +186,6 @@ class AsideTicketController extends BaseController
 
 
             $ticket->reply = $request->input('reply', null);
             $ticket->reply = $request->input('reply', null);
             $ticket->status = $request->input('status', $ticket->status);
             $ticket->status = $request->input('status', $ticket->status);
-            $ticket->save();
             if ($ticket->status == Tickets::STATUS_COMPLETED)
             if ($ticket->status == Tickets::STATUS_COMPLETED)
             {
             {
                 // 完成工单，把子任务里面未完成的工单改为完成
                 // 完成工单，把子任务里面未完成的工单改为完成
@@ -194,6 +193,7 @@ class AsideTicketController extends BaseController
                 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)
                 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)
                     ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now()]);
                     ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now()]);
             }
             }
+            $ticket->save();
             return $ticket;
             return $ticket;
         });
         });
         $this->response('success', Code::SUCCESS, $result->toArray());
         $this->response('success', Code::SUCCESS, $result->toArray());