fix bug

api/application/controllers/Common.php

@@ -34,6 +34,7 @@ class Common extends CI_Controller {
                 'id' => $user['id'],
                 'role' => intval($user['role']),
                 'name' => $user['name'],
+                'avatar' => empty($user['avatar']) ? '' : base_url($user['avatar']);
             );
             
             $this->userinfo = $user;

api/application/controllers/User.php

@@ -30,8 +30,11 @@ class User extends Base_Controller{
 			$data['email'] = $this->get_user_info('email');
 			$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');
+			$data = $this->User_model->get_one(['id'=>$id],'role,id,name,company,phone,email,avatar');
+			$data['avatar'] = !empty($data['avatar']) ? base_url($data['avatar']) : '';
 		}
 
         exit(json_result('0000',$this->response['0000'],$data));
@@ -154,14 +157,17 @@ class User extends Base_Controller{
 		$data['password'] = $this->input->post('password',true);
 		$email = $this->input->post('email',true);
 		$data['company'] = $this->input->post('company',true);
+		$avatar = $this->input->post('avatar',true);
+		if (isset($avatar) && !empty($avatar)) {
+            $path = parse_url($avatar);
+            $data['avatar'] = substr($path['path'], 1);
+        }
 
 		if (!empty($phone)) $data['phone'] = $phone;
 		if (!empty($telephone)) $data['telephone'] = $telephone;
 		if (!empty($email)) $data['email'] = $email;
 		
 		if(!isset($data['name']) || isset($data['name']) == '') exit(json_result('0707',$this->response['0707'],array()));
-		if(!isset($data['username']) || $data['username'] == '') exit(json_result('0708',$this->response['0708'],array()));
-		if(mb_strlen($data['username']) > 20) exit(json_result('0723',$this->response['0723'],array()));
 		if(empty($data['company'])) exit(json_result('0712',$this->response['0712'],array()));
 
 		// $data['zone'] = empty($zone) ? '' : $zone;
@@ -205,6 +211,8 @@ class User extends Base_Controller{
 		    }
 		}
 		if (empty($where['id'])) { // 添加用户
+			if(!isset($data['username']) || $data['username'] == '') exit(json_result('0708',$this->response['0708'],array()));
+			if(mb_strlen($data['username']) > 20) exit(json_result('0723',$this->response['0723'],array()));
 			if (empty($data['password'])) {
 				exit(json_result('0713',$this->response['0713'],array()));
 			}
@@ -237,9 +245,9 @@ class User extends Base_Controller{
 		}else{  // 编辑用户
 			unset($data['password']);
 
-			if ($this->User_model->getDataCount(array('username'=>$data['username']),$where['id'])) {
-				exit(json_result('0706',$this->response['0706'],array()));
-			}
+			// if ($this->User_model->getDataCount(array('username'=>$data['username']),$where['id'])) {
+			// 	exit(json_result('0706',$this->response['0706'],array()));
+			// }
 			if (!empty($data['phone']) && $this->User_model->getDataCount(array('phone'=>$data['phone']),$where['id'])) {
                 exit(json_result('0721',$this->response['0721'],array()));
             }