|  | @@ -396,7 +396,7 @@ class Guild extends Api
 | 
	
		
			
				|  |  |          $is_pass = $this->request->request("is_pass"); // 是否通过:1=通过,-1=拒绝
 | 
	
		
			
				|  |  |          if(!in_array($is_pass,[1,-1]) || !$joinin_id) $this->error("参数错误!");
 | 
	
		
			
				|  |  |          $user_id = $this->auth->id;
 | 
	
		
			
				|  |  | -        $memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id,"status"=>1])->find();
 | 
	
		
			
				|  |  | +        $memberfind = \app\common\model\GuildMember::where(["user_id"=>$joinin_id,"status"=>1])->find();
 | 
	
		
			
				|  |  |          if($memberfind) $this->error("该用户已有家族!");
 | 
	
		
			
				|  |  |          // 获取申请信息
 | 
	
		
			
				|  |  |          $joininInfo =  \app\common\model\GuildJoinin::where(["id"=>$joinin_id])->find();
 |