ad

app/user/controller/Base.php

@@ -16,6 +16,7 @@ class Base extends \app\BaseController{
 		parent::__construct($app);
 			$this->token = $this->request->param('token','','trim');
 	    if (!action_in_arr($this->noLogin)){
+	    	if($this->token=='')throw new \Exception("token不能为空",101);
 	        $this->Auth();
 	    }
 	}

app/user/controller/Login.php

@@ -30,6 +30,7 @@ class Login extends Base{
 		$info->system_version = (new AccountPlat())->where(['account_id'=>$info->id])->column('system_version','plat_code');
 		$token = makeToken($info->username);
 		\app\common\User::instance()->LoginUserInfo($info->toArray(),$token,$this->keepTime);
+		$info->token= $token;
 		return success("登录成功",$info);
 	}
 }

app/user/controller/User.php

@@ -13,14 +13,15 @@ class User extends Base
   }
   
   public function userList(){
-        $post  =$this->request->param(['page'=>1,'size'=>10,'nickname'=>'','username'=>'','level'=>'','status'=>''],"post","trim");
+        $post  =$this->request->param(['page'=>1,'size'=>10,'nickname'=>'','username'=>'','level'=>'','itemid'=>'','status'=>''],"post","trim");
         $where=[['is_del','=',0]];
         if($post['nickname']!='') $where[]=['userInfo.nickname','like',"%{$post['nickname']}%"];
         if($post['username']!='') $where[]=['username','like',"%{$post['username']}%"];
         if($post['status']!=='')$where[]=['status','=',$post['status']];
         if($post['level']!=0) $where[]=['level','=',$post['level']];
+         if($post['itemid']!=0) $where[]=['accountItem.itemid','=',$post['itemid']];
         $list=$this->model->with(['accountItem'=>['itemName'],'company_relaton'])
-        ->withJoin(['userInfo'],'left')
+        ->withJoin(['userInfo',"accountItem"],'left')
         ->where($where)->order('account.id asc')
         ->paginate(['list_rows'=>$post['size'],'page'=>$post['page']]);
         $list->hidden(['userInfo','password','salt','accountItem']);