|
@@ -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')->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')
|
|
|
-
|
|
|
- ->select();
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
$lists = list_domain_image($lists,['avatar,audio_bio']);
|
|
|
|