first

application/api/controller/Usercenter.php

@@ -2125,19 +2125,19 @@ $resArray['money'] = $money;  //返回给前端的计算结果
             $map['open_match_video'] = 1;
         }
 
-//        $lists = Db::name('user')->field('id,nickname,username,avatar')->where($map)->order('is_active desc, active_time desc')/*->page($this->page,100)*/->select();
+        $lists = Db::name('user')->field('id,nickname,username,avatar')->where($map)->order('is_active desc, active_time desc')/*->page($this->page,100)*/->select();
         //$lists = $this->fliter_user($lists,100);
 
         // 排除已经搭讪过的用户 2023年12月1日 11点35分
-        $userGreetIds = Db::name('user_greet')->where('user_id',$this->auth->id)->column('user_to_id');
-
-        $lists = Db::name('user')
-            ->field('id,nickname,username,avatar')
-            ->where($map)
-            ->whereNotIn('id',$userGreetIds)
-            ->order('is_active desc, active_time desc')
-            /*->page($this->page,100)*/
-            ->select();
+//        $userGreetIds = Db::name('user_greet')->where('user_id',$this->auth->id)->column('user_to_id');
+//
+//        $lists = Db::name('user')
+//            ->field('id,nickname,username,avatar')
+//            ->where($map)
+//            ->whereNotIn('id',$userGreetIds)
+//            ->order('is_active desc, active_time desc')
+//            /*->page($this->page,100)*/
+//            ->select();
 
         $lists = list_domain_image($lists,['avatar,audio_bio']);