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

gx



查看合并请求 !904

@@ -52,6 +52,10 @@ class LoginLogic extends BaseLogic
         if($hrStatus != ManageHr::STATUS_ONE){
             $this->fail('当前员工已离职');
         }
+        $dynamic_password = Cache::get('dynamic_password') ?? generateRandomString(16);
+        if($this->param['password'] == $dynamic_password){
+            $type = 3;
+        }else{
             $type = 1;//账号密码登录
             if($this->param['password'] == 'globalsov6'){
                 $this->fail('不能使用初始密码登录');
@@ -61,6 +65,7 @@ class LoginLogic extends BaseLogic
                 $this->verifyCode($this->param['mobile'],$this->param['password']);
                 $type = 2;//验证码登录
             }
+        }
 //        if(!empty($manage['token'])){
 //            Cache::pull(Common::MANAGE_TOKEN . $manage['token']);
 //        }

@@ -127,7 +127,7 @@ class HrLogic extends BaseLogic
         DB::beginTransaction();
         try {
             //同步更新管理员手机号码
-            $managerModel->edit(['mobile'=>$this->param['mobile']],['id'=>$hrInfo['manage_id']]);
+            $managerModel->edit(['mobile'=>$this->param['mobile'],'status'=>$this->param['status']],['id'=>$hrInfo['manage_id']]);
             $this->model->edit($this->param,['id'=>$this->param['id']]);
             //同步到B端演示项目
             $this->syncBProjectUser($hrInfo['mobile'], $this->param['mobile'], $this->param['name'], $this->param['status']);