|
|
@@ -248,7 +248,7 @@ class Login extends Api
|
|
|
if (!$phone_user_data) return json_send(['code' => 'error', 'msg' => '手机号码未授权']);
|
|
|
if ($phone_user_data['status']) return json_send(['code' => 'error', 'msg' => '该账号已停用']);
|
|
|
$company_id = $phone_user_data->company_id;
|
|
|
- $uid = $phone_user_data->employee_id;
|
|
|
+ $uid = $phone_user_data->uid;
|
|
|
//获取用户的openid
|
|
|
$tokenData = Mini::jscode2session($open_code, $appId);
|
|
|
if (!isset($tokenData['openid']) || !$tokenData['openid']) return json_send(['code' => 'error', 'msg' => '获取openid失败', 'data' => $tokenData]);
|
|
|
@@ -290,9 +290,9 @@ class Login extends Api
|
|
|
// 转数组
|
|
|
$admin = $phone_user_data->toArray();
|
|
|
// 登录
|
|
|
- $accessToken = $EmployeeModel->Login($admin['id'], $admin['company_id'], 'api');
|
|
|
+ $accessToken = $EmployeeModel->Login($admin['uid'], $admin['company_id'], 'api');
|
|
|
if (isset($accessToken['error'])) return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
|
|
|
- $accessToken['username'] = $admin['name'];
|
|
|
+ $accessToken['username'] = $admin['username'];
|
|
|
$accessToken['is_system_admin'] = 0;
|
|
|
// 表单令牌
|
|
|
return json_send(['code' => 'success', 'msg' => '登录成功', 'data' => $accessToken]);
|
