正在显示
1 个修改的文件
包含
5 行增加
和
2 行删除
| @@ -36,7 +36,8 @@ class OperationHeartbeatController extends BaseController | @@ -36,7 +36,8 @@ class OperationHeartbeatController extends BaseController | ||
| 36 | 'is_custom.required' => '是否为扩展模版', | 36 | 'is_custom.required' => '是否为扩展模版', |
| 37 | 'is_template.required' => '详情页/可视化', | 37 | 'is_template.required' => '详情页/可视化', |
| 38 | ]); | 38 | ]); |
| 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']]; | 39 | + $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'source_id'=>$this->param['source_id'], |
| 40 | + 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']]; | ||
| 40 | $operationHeartbeatModel = new OperationHeartbeat(); | 41 | $operationHeartbeatModel = new OperationHeartbeat(); |
| 41 | $info = $operationHeartbeatModel->read($condition,['id','status']); | 42 | $info = $operationHeartbeatModel->read($condition,['id','status']); |
| 42 | $condition['status'] = $condition['status'] ?? 0; | 43 | $condition['status'] = $condition['status'] ?? 0; |
| @@ -60,16 +61,18 @@ class OperationHeartbeatController extends BaseController | @@ -60,16 +61,18 @@ class OperationHeartbeatController extends BaseController | ||
| 60 | public function getInfo(){ | 61 | public function getInfo(){ |
| 61 | $this->request->validate([ | 62 | $this->request->validate([ |
| 62 | 'source'=>'required', | 63 | 'source'=>'required', |
| 64 | + 'source_id'=>'required', | ||
| 63 | 'is_list' => 'required', | 65 | 'is_list' => 'required', |
| 64 | 'is_custom'=>'required', | 66 | 'is_custom'=>'required', |
| 65 | 'is_template'=>'required', | 67 | 'is_template'=>'required', |
| 66 | ], [ | 68 | ], [ |
| 67 | 'source.required' => '请选择页面', | 69 | 'source.required' => '请选择页面', |
| 70 | + 'source_id.required' => '请选择数据id', | ||
| 68 | 'is_list.required' => '列表页/详情页', | 71 | 'is_list.required' => '列表页/详情页', |
| 69 | 'is_custom.required' => '是否为扩展模版', | 72 | 'is_custom.required' => '是否为扩展模版', |
| 70 | 'is_template.required' => '详情页/可视化', | 73 | 'is_template.required' => '详情页/可视化', |
| 71 | ]); | 74 | ]); |
| 72 | - $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'], | 75 | + $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'source_id'=>$this->param['source_id'], |
| 73 | 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']]; | 76 | 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']]; |
| 74 | $operationHeartbeatModel = new OperationHeartbeat(); | 77 | $operationHeartbeatModel = new OperationHeartbeat(); |
| 75 | $info = $operationHeartbeatModel->read($condition,['id','status']); | 78 | $info = $operationHeartbeatModel->read($condition,['id','status']); |
-
请 注册 或 登录 后发表评论