RV
This commit is contained in:
parent
abe917bfab
commit
42dfdc5e76
@ -210,10 +210,20 @@ class RestAuthenticationController extends AdminController
|
|||||||
$client_id = $this->request->getJSON()->client_id ?? null;
|
$client_id = $this->request->getJSON()->client_id ?? null;
|
||||||
$employee_id = $this->request->getJSON()->employee_id ?? null;
|
$employee_id = $this->request->getJSON()->employee_id ?? null;
|
||||||
|
|
||||||
|
// $builder = $this->employeeModel
|
||||||
|
// ->where('email_corporate', $email)
|
||||||
|
// ->where('relationship', 'Self')
|
||||||
|
// ->where('is_active', 1);
|
||||||
|
|
||||||
$builder = $this->employeeModel
|
$builder = $this->employeeModel
|
||||||
->where('email_corporate', $email)
|
->join('employee_polices EP', 'EP.employee_id = employees.id', 'inner')
|
||||||
->where('relationship', 'Self')
|
->where('employees.email_corporate', $email)
|
||||||
->where('is_active', 1);
|
->where('employees.relationship', 'Self')
|
||||||
|
->where('employees.is_active', 1)
|
||||||
|
->whereIn('employees.emp_status', ['active', 'expired'])
|
||||||
|
->where('EP.is_active', 1)
|
||||||
|
->whereIn('EP.status', ['active', 'expired']);
|
||||||
|
|
||||||
|
|
||||||
if (!empty($client_id)) {
|
if (!empty($client_id)) {
|
||||||
$builder->where('client_id', $client_id);
|
$builder->where('client_id', $client_id);
|
||||||
@ -225,7 +235,6 @@ class RestAuthenticationController extends AdminController
|
|||||||
|
|
||||||
$builder->set(['otp' => $otp])->update();
|
$builder->set(['otp' => $otp])->update();
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -585,7 +594,7 @@ class RestAuthenticationController extends AdminController
|
|||||||
|
|
||||||
if(isset($HRAccessData['allowed_modules'])){ $hrData['0']['allowed_modules'] = json_decode($HRAccessData['allowed_modules'],true)['post']; }else{ $hrData['0']['allowed_modules'] = []; }
|
if(isset($HRAccessData['allowed_modules'])){ $hrData['0']['allowed_modules'] = json_decode($HRAccessData['allowed_modules'],true)['post']; }else{ $hrData['0']['allowed_modules'] = []; }
|
||||||
|
|
||||||
|
$hrData['0']['token_type'] = 'post';
|
||||||
$result = JWTToken::encode($hrData['0']);
|
$result = JWTToken::encode($hrData['0']);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user