三项匹配，去掉好友限制

application/api/controller/Usercenter.php

@@ -672,9 +672,9 @@ class Usercenter extends Api
         }
 
         //找到互关的人，排除
-        $follow_me = Db::name('user_follow')->where('follow_uid',$this->auth->id)->column('uid');
+        //$follow_me = Db::name('user_follow')->where('follow_uid',$this->auth->id)->column('uid');
         //dump($follow_me);
-        $my_follow = Db::name('user_follow')->where(['uid'=>$this->auth->id,'follow_uid'=>['IN',$follow_me]])->column('follow_uid');
+        //$my_follow = Db::name('user_follow')->where(['uid'=>$this->auth->id,'follow_uid'=>['IN',$follow_me]])->column('follow_uid');
         //dump($my_follow);exit;
 
 
@@ -688,7 +688,7 @@ class Usercenter extends Api
             //'real_status' => 1,                                 //真人认证
             //'idcard_status' => 1,                               //实名认证
             'open_match_audio' => 1,                            //打开语聊开关
-            'id' => ['NOT IN',$my_follow]                       //不是好友的
+            //'id' => ['NOT IN',$my_follow]                       //不是好友的
         ];
 
         $lists = Db::name('user')->field('id,cityname,status,gender,real_status,tag_ids')->where($map)->order('logintime desc')->page($this->page,100)->select();
@@ -740,9 +740,9 @@ class Usercenter extends Api
         }
 
         //找到互关的人，排除
-        $follow_me = Db::name('user_follow')->where('follow_uid',$this->auth->id)->column('uid');
+        //$follow_me = Db::name('user_follow')->where('follow_uid',$this->auth->id)->column('uid');
         //dump($follow_me);
-        $my_follow = Db::name('user_follow')->where(['uid'=>$this->auth->id,'follow_uid'=>['IN',$follow_me]])->column('follow_uid');
+        //$my_follow = Db::name('user_follow')->where(['uid'=>$this->auth->id,'follow_uid'=>['IN',$follow_me]])->column('follow_uid');
         //dump($my_follow);exit;
 
 
@@ -756,7 +756,7 @@ class Usercenter extends Api
             //'real_status' => 1,                                 //真人认证
             //'idcard_status' => 1,                               //实名认证
             'open_match_video' => 1,                            //打开视频开关的
-            'id' => ['NOT IN',$my_follow]                       //不是好友的
+           // 'id' => ['NOT IN',$my_follow]                       //不是好友的
         ];
 
         $lists = Db::name('user')->field('id,cityname,status,gender,real_status,tag_ids')->where($map)->order('logintime desc')->page($this->page,100)->select();
@@ -784,9 +784,9 @@ class Usercenter extends Api
     public function gettypinguser(){
 
         //找到互关的人，排除
-        $follow_me = Db::name('user_follow')->where('follow_uid',$this->auth->id)->column('uid');
+        //$follow_me = Db::name('user_follow')->where('follow_uid',$this->auth->id)->column('uid');
         //dump($follow_me);
-        $my_follow = Db::name('user_follow')->where(['uid'=>$this->auth->id,'follow_uid'=>['IN',$follow_me]])->column('follow_uid');
+        //$my_follow = Db::name('user_follow')->where(['uid'=>$this->auth->id,'follow_uid'=>['IN',$follow_me]])->column('follow_uid');
         //dump($my_follow);exit;
 
         //给出备选用户
@@ -798,7 +798,7 @@ class Usercenter extends Api
             //'is_active' => 1,                                   //在线的
             //打开聊天开关的
             'open_match_typing' => 1,                            //打开文字聊天开关的
-            'id' => ['NOT IN',$my_follow]                        //不是好友的
+            //'id' => ['NOT IN',$my_follow]                        //不是好友的
         ];
 
         $lists = Db::name('user')->field('id,cityname,status,gender,real_status,tag_ids')->where($map)->order('logintime desc')->page($this->page,100)->select();