|
@@ -89,23 +89,23 @@ class OperationHeartbeatController extends BaseController |
|
@@ -89,23 +89,23 @@ class OperationHeartbeatController extends BaseController |
|
89
|
$operationHeartbeatModel->edit(['status'=>0,'ip'=>'127.0.0.1'],$condition);
|
89
|
$operationHeartbeatModel->edit(['status'=>0,'ip'=>'127.0.0.1'],$condition);
|
|
90
|
$info['status'] = 0;
|
90
|
$info['status'] = 0;
|
|
91
|
}
|
91
|
}
|
|
92
|
- }
|
|
|
|
93
|
- if($info['status'] == 1){
|
|
|
|
94
|
- //当前登录为切入登录
|
|
|
|
95
|
- if(isset($this->user['manager_id']) && !empty($this->user['manager_id'])){
|
|
|
|
96
|
- //上一次验证也是切入登录
|
|
|
|
97
|
- if($info['manager_id'] != 0){
|
|
|
|
98
|
- $managerModel = new Manage();
|
|
|
|
99
|
- $managerInfo = $managerModel->read(['id'=>$info['manager_id']],['name']);
|
|
|
|
100
|
- $info['message'] = '此页面数据已有人在编辑,请勿重复操作!操作人ip:'.$info['ip'].'操作的管理员为:'.$managerInfo['name'];
|
92
|
+ if($info['status'] == 1){
|
|
|
|
93
|
+ //当前登录为切入登录
|
|
|
|
94
|
+ if(isset($this->user['manager_id']) && !empty($this->user['manager_id'])){
|
|
|
|
95
|
+ //上一次验证也是切入登录
|
|
|
|
96
|
+ if($info['manager_id'] != 0){
|
|
|
|
97
|
+ $managerModel = new Manage();
|
|
|
|
98
|
+ $managerInfo = $managerModel->read(['id'=>$info['manager_id']],['name']);
|
|
|
|
99
|
+ $info['message'] = '此页面数据已有人在编辑,请勿重复操作!操作人ip:'.$info['ip'].'操作的管理员为:'.$managerInfo['name'];
|
|
|
|
100
|
+ }else{
|
|
|
|
101
|
+ //账号密码登录
|
|
|
|
102
|
+ $userModel = new User();
|
|
|
|
103
|
+ $userInfo = $userModel->read(['id'=>$info['operator_id']],['name']);
|
|
|
|
104
|
+ $info['message'] = '此页面数据已有人在编辑,请勿重复操作!'.$userInfo['name'].'用户登录在操作。';
|
|
|
|
105
|
+ }
|
|
101
|
}else{
|
106
|
}else{
|
|
102
|
- //账号密码登录
|
|
|
|
103
|
- $userModel = new User();
|
|
|
|
104
|
- $userInfo = $userModel->read(['id'=>$info['operator_id']],['name']);
|
|
|
|
105
|
- $info['message'] = '此页面数据已有人在编辑,请勿重复操作!'.$userInfo['name'].'用户登录在操作。';
|
107
|
+ $info['message'] = '此页面数据已有人在编辑,请勿重复操作!';
|
|
106
|
}
|
108
|
}
|
|
107
|
- }else{
|
|
|
|
108
|
- $info['message'] = '此页面数据已有人在编辑,请勿重复操作!';
|
|
|
|
109
|
}
|
109
|
}
|
|
110
|
}
|
110
|
}
|
|
111
|
$this->response('success',Code::SUCCESS,$info);
|
111
|
$this->response('success',Code::SUCCESS,$info);
|