|
|
@@ -57,6 +57,8 @@ class Common extends CI_Controller {
|
|
|
if ($user['password'] != $password) {
|
|
|
exit(json_result('0101', $this->response['0101']));
|
|
|
}
|
|
|
+ $comInfo = $this->Company_model->get_one(['id'=>$user['companyid']],'name,no');
|
|
|
+ $company = !empty($comInfo['no']) ? $comInfo['no'] : $comInfo['name'];
|
|
|
$data = array(
|
|
|
'token' => generate_token($username, $password, $client_key),
|
|
|
'username' => $user['username'],
|
|
|
@@ -64,7 +66,8 @@ class Common extends CI_Controller {
|
|
|
'role' => intval($user['role']),
|
|
|
'name' => $user['name'],
|
|
|
'privilege' => $user['privilege'],
|
|
|
- 'avatar' => empty($user['avatar']) ? '' : base_url($user['avatar'])
|
|
|
+ 'avatar' => empty($user['avatar']) ? '' : base_url($user['avatar']),
|
|
|
+ 'company' => $company
|
|
|
);
|
|
|
|
|
|
$this->userinfo = $user;
|
