Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/zhjwxt

niucloud/app/service/api/login/LoginService.php

@@ -349,8 +349,10 @@ class LoginService extends BaseApiService
 
     }
 
+    //员工登陆
     public function loginByPersonnel($params)
     {
+        //查询员工信息
         $member_info = (new Personnel())->where('phone', $params['phone'])->find();
 
         if ($member_info->status != 2) throw new ApiException('账号状态异常禁止登录');
@@ -368,14 +370,13 @@ class LoginService extends BaseApiService
         $token_info = TokenAuth::createToken($member_info->id, AppTypeDict::PERSONNEL, ['id' => $member_info->id, 'member_id'=>$member_info->id, 'phone' => $member_info->phone, 'user_type' => $params['login_type']], $expire_time);
         event("PersonnelLogin", $member_info);
 
-        $role = CampusPersonRole::where('person_id',$member_info['id'])->column('role_id');
-
         //login_type|1=教练,2=销售
         $user_type = '';//1=教练,2=销售
-        if(in_array(2,$role) && $params['login_type'] == 2){
+        //判断员工账户的类型是教练还是销售
+        if($member_info['account_type']=='market' && $params['login_type'] == 2){
             //销售登陆
             $user_type = 2;
-        }elseif(in_array(3,$role) && $params['login_type'] == 1){
+        }elseif($member_info['account_type']=='teacher' && $params['login_type'] == 1){
             //教师登陆
             $user_type = 1;
         }