作者 lyh

gx

@@ -232,7 +232,6 @@ class ProjectController extends BaseController @@ -232,7 +232,6 @@ class ProjectController extends BaseController
232 'status.required' => '请选择审核状态', 232 'status.required' => '请选择审核状态',
233 'status.in' => '审核状态值无效', 233 'status.in' => '审核状态值无效',
234 ]); 234 ]);
235 - $this->param['manage_id'] = $this->manage['id'];  
236 $logic->onlineCheck($this->param); 235 $logic->onlineCheck($this->param);
237 return $this->success(); 236 return $this->success();
238 } 237 }
@@ -17,6 +17,20 @@ class OnlineCheckLogic extends BaseLogic @@ -17,6 +17,20 @@ class OnlineCheckLogic extends BaseLogic
17 17
18 18
19 public function onlineCheck($param){ 19 public function onlineCheck($param){
  20 + $info = $this->model->where('project_id', $param['id'])->first();
  21 + if(!$info){
  22 + $this->fail('项目未提交审核');
  23 + }
  24 + //查看当前用户是否有权限审核
  25 + if($param['type'] == 'optimist'){
  26 + if($info['optimist_mid'] != $this->manager['id']){
  27 + $this->fail('你无权限提交审核');
  28 + }
  29 + }else{
  30 + if($info['qa_mid'] != $this->manager['id']){
  31 + $this->fail('你无权限提交审核');
  32 + }
  33 + }
20 $data = [ 34 $data = [
21 'project_id' => $param['id'], 35 'project_id' => $param['id'],
22 $param['type'] . '_mid' => $param['manage_id'], 36 $param['type'] . '_mid' => $param['manage_id'],
@@ -24,10 +38,7 @@ class OnlineCheckLogic extends BaseLogic @@ -24,10 +38,7 @@ class OnlineCheckLogic extends BaseLogic
24 $param['type'] . '_status' => $param['status'], 38 $param['type'] . '_status' => $param['status'],
25 'remark' => $param['remark'] ??'', 39 'remark' => $param['remark'] ??'',
26 ]; 40 ];
27 - $info = $this->model->where('project_id', $data['project_id'])->first();  
28 - if(!$info){  
29 - $this->fail('项目未提交审核');  
30 - } 41 +
31 $data['id'] = $info['id']; 42 $data['id'] = $info['id'];
32 return $this->save($data); 43 return $this->save($data);
33 } 44 }
@@ -108,6 +108,8 @@ class UserLoginLogic @@ -108,6 +108,8 @@ class UserLoginLogic
108 //密码加密 108 //密码加密
109 $password = base64_encode(md5($this->param['password'])); 109 $password = base64_encode(md5($this->param['password']));
110 if($password != $info['password']){ 110 if($password != $info['password']){
  111 + var_dump(1111);
  112 + die();
111 $this->verifyCode($this->param['mobile'],$this->param['password']); 113 $this->verifyCode($this->param['mobile'],$this->param['password']);
112 } 114 }
113 return $this->success($info); 115 return $this->success($info);