|
@@ -36,11 +36,12 @@ class OperationHeartbeatController extends BaseController |
|
@@ -36,11 +36,12 @@ class OperationHeartbeatController extends BaseController |
|
36
|
'is_template.required' => '详情页/可视化',
|
36
|
'is_template.required' => '详情页/可视化',
|
|
37
|
'operator_id.required' => '操作人',
|
37
|
'operator_id.required' => '操作人',
|
|
38
|
]);
|
38
|
]);
|
|
39
|
- $condition = ['source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
|
39
|
+ $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
|
|
40
|
$operationHeartbeatModel = new OperationHeartbeat();
|
40
|
$operationHeartbeatModel = new OperationHeartbeat();
|
|
41
|
$info = $operationHeartbeatModel->read($condition,['id','status']);
|
41
|
$info = $operationHeartbeatModel->read($condition,['id','status']);
|
|
|
|
42
|
+ $condition['status'] = $condition['status'] ?? 0;
|
|
42
|
if($info === false){
|
43
|
if($info === false){
|
|
43
|
- $condition['status'] = 1;
|
44
|
+ $condition['project_id'] = $this->user['project_id'];
|
|
44
|
$operationHeartbeatModel->addReturnId($condition);
|
45
|
$operationHeartbeatModel->addReturnId($condition);
|
|
45
|
}else{
|
46
|
}else{
|
|
46
|
$operationHeartbeatModel->edit(['status'=>1],['id'=>$info['id']]);
|
47
|
$operationHeartbeatModel->edit(['status'=>1],['id'=>$info['id']]);
|
|
@@ -69,7 +70,8 @@ class OperationHeartbeatController extends BaseController |
|
@@ -69,7 +70,8 @@ class OperationHeartbeatController extends BaseController |
|
69
|
'is_template.required' => '详情页/可视化',
|
70
|
'is_template.required' => '详情页/可视化',
|
|
70
|
'operator_id.required' => '操作人',
|
71
|
'operator_id.required' => '操作人',
|
|
71
|
]);
|
72
|
]);
|
|
72
|
- $condition = ['source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
|
73
|
+ $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],
|
|
|
|
74
|
+ 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
|
|
73
|
$operationHeartbeatModel = new OperationHeartbeat();
|
75
|
$operationHeartbeatModel = new OperationHeartbeat();
|
|
74
|
$info = $operationHeartbeatModel->read($condition,['id','status']);
|
76
|
$info = $operationHeartbeatModel->read($condition,['id','status']);
|
|
75
|
$this->response('success',Code::SUCCESS,$info);
|
77
|
$this->response('success',Code::SUCCESS,$info);
|