匹配bug

application/api/controller/Index.php

@@ -303,7 +303,7 @@ class Index extends Api
         $where = [
             'user.id' => ['neq',$this->auth->id],
             'user.status' => 1,
-            'user.is_avtive' => 1,
+            'user.is_active' => 1,
         ];
 
         //性别
@@ -354,7 +354,7 @@ class Index extends Api
         }
 
         $result = Db::name('user')->alias('user')
-            ->join('user_active active' ,'user.id = active.user_id','LEFT')
+            //->join('user_active active' ,'user.id = active.user_id','LEFT')
             ->where($where)
             ->where($where_op)
             ->where($where_black)

application/common/controller/Api.php

@@ -386,6 +386,9 @@ class Api
     protected function user_active(){
         if($this->auth->isLogin()){
             db('user_active')->where('user_id',$this->auth->id)->update(['requesttime'=>time()]);
+            if($this->auth->is_active == 0){
+                db('user')->where('id',$this->auth->id)->update(['is_active'=>1]);
+            }
         }
     }