gx

@@ -96,7 +96,11 @@ class OperationHeartbeatController extends BaseController
                     if($info['manager_id'] != 0){
                     if($info['manager_id'] != 0){
                         $managerModel = new Manage();
                         $managerModel = new Manage();
                         $managerInfo = $managerModel->read(['id'=>$info['manager_id']],['name']);
                         $managerInfo = $managerModel->read(['id'=>$info['manager_id']],['name']);
-                        $info['message'] = '此页面数据已有人在编辑，请勿重复操作！操作人ip：'.$info['ip'].'操作的管理员为：'.$managerInfo['name'];
+                        if(($info['ip'] == $this->request->ip()) && ($info['manager_id'] == $this->user['manager_id'])){
+                            $info['status'] = 0;
+                        }else{
+                            $info['message'] = '此页面数据已有人在编辑，请勿重复操作！操作人ip：'.$info['ip'].'操作的管理员为：'.$managerInfo['name'];
+                        }
                     }else{
                     }else{
                         //账号密码登录
                         //账号密码登录
                         $userModel = new User();
                         $userModel = new User();