|
|
@@ -28,12 +28,13 @@ class User extends Base_Controller{
|
|
|
$data['id'] = $this->get_user_info('id');
|
|
|
$data['phone'] = $this->get_user_info('phone');
|
|
|
$data['email'] = $this->get_user_info('email');
|
|
|
+ $data['account'] = $this->get_user_info('username');
|
|
|
$data['name'] = $this->get_user_info('name');
|
|
|
$data['company'] = $this->get_user_info('company');
|
|
|
$avatar = $this->get_user_info('avatar');
|
|
|
$data['avatar'] = !empty($avatar) ? base_url($avatar) : '';
|
|
|
}else{
|
|
|
- $data = $this->User_model->get_one(['id'=>$id],'role,id,name,company,phone,email,avatar');
|
|
|
+ $data = $this->User_model->get_one(['id'=>$id],'role,id,name,company,phone,email,avatar,username as account');
|
|
|
$data['avatar'] = !empty($data['avatar']) ? base_url($data['avatar']) : '';
|
|
|
}
|
|
|
|
