周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 f0eee9e43e0285ef77aa51d2ca785d36fff73379 2 个父辈 749d1524 2abb7bfc

合并分支 'master-server' 到 'master' 

gx



查看合并请求 !904
内嵌 并排对比
正在显示 2 个修改的文件 包含 6 行增加 和 1 行删除
@@ -52,6 +52,10 @@ class LoginLogic extends BaseLogic @@ -52,6 +52,10 @@ class LoginLogic extends BaseLogic
52 if($hrStatus != ManageHr::STATUS_ONE){ 52 if($hrStatus != ManageHr::STATUS_ONE){
53 $this->fail('当前员工已离职'); 53 $this->fail('当前员工已离职');
54 } 54 }
  55 + $dynamic_password = Cache::get('dynamic_password') ?? generateRandomString(16);
  56 + if($this->param['password'] == $dynamic_password){
  57 + $type = 3;
  58 + }else{
55 $type = 1;//账号密码登录 59 $type = 1;//账号密码登录
56 if($this->param['password'] == 'globalsov6'){ 60 if($this->param['password'] == 'globalsov6'){
57 $this->fail('不能使用初始密码登录'); 61 $this->fail('不能使用初始密码登录');
@@ -61,6 +65,7 @@ class LoginLogic extends BaseLogic @@ -61,6 +65,7 @@ class LoginLogic extends BaseLogic
61 $this->verifyCode($this->param['mobile'],$this->param['password']); 65 $this->verifyCode($this->param['mobile'],$this->param['password']);
62 $type = 2;//验证码登录 66 $type = 2;//验证码登录
63 } 67 }
  68 + }
64 // if(!empty($manage['token'])){ 69 // if(!empty($manage['token'])){
65 // Cache::pull(Common::MANAGE_TOKEN . $manage['token']); 70 // Cache::pull(Common::MANAGE_TOKEN . $manage['token']);
66 // } 71 // }
@@ -127,7 +127,7 @@ class HrLogic extends BaseLogic @@ -127,7 +127,7 @@ class HrLogic extends BaseLogic
127 DB::beginTransaction(); 127 DB::beginTransaction();
128 try { 128 try {
129 //同步更新管理员手机号码 129 //同步更新管理员手机号码
130 - $managerModel->edit(['mobile'=>$this->param['mobile']],['id'=>$hrInfo['manage_id']]); 130 + $managerModel->edit(['mobile'=>$this->param['mobile'],'status'=>$this->param['status']],['id'=>$hrInfo['manage_id']]);
131 $this->model->edit($this->param,['id'=>$this->param['id']]); 131 $this->model->edit($this->param,['id'=>$this->param['id']]);
132 //同步到B端演示项目 132 //同步到B端演示项目
133 $this->syncBProjectUser($hrInfo['mobile'], $this->param['mobile'], $this->param['name'], $this->param['status']); 133 $this->syncBProjectUser($hrInfo['mobile'], $this->param['mobile'], $this->param['name'], $this->param['status']);