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

变更数据



查看合并请求 !3352

@@ -56,7 +56,7 @@ class OperationHeartbeatController extends BaseController
             $condition['manager_id'] = $this->user['manager_id'] ?? 0;
             $condition['manager_id'] = $this->user['manager_id'] ?? 0;
             $operationHeartbeatModel->addReturnId($condition);
             $operationHeartbeatModel->addReturnId($condition);
         }else{
         }else{
-            $operationHeartbeatModel->edit(['status'=>$condition['status'] ?? 0,'ip'=>$this->request->ip(),'manager_id'=> $this->user['manager_id'] ?? 0],['id'=>$info['id']]);
+            $operationHeartbeatModel->edit(['status'=>$condition['status'] ?? 0,'operator_id'=>$this->user['id'],'ip'=>$this->request->ip(),'manager_id'=> $this->user['manager_id'] ?? 0],['id'=>$info['id']]);
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }