Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into stabble

app/Http/Controllers/Wap/User/CoflController.php

@@ -304,7 +304,7 @@ class CoflController extends Controller
     private function getUsersV2($openid,$bid){
         $friend_link_uid_bind = DB::table('friend_link_uid_bind')->where('openid',$openid)->where('bid',$bid)->first();
         if($friend_link_uid_bind) {
-            $user = User::where('id',$friend_link_uid_bind->uid)->select('id','distribution_channel_id')->get();
+            $user = User::where('id',$friend_link_uid_bind->uid)->select('id','distribution_channel_id')->first();
             if($user) {
                 return [$user->id,$user->distribution_channel_id];
             }
@@ -315,6 +315,7 @@ class CoflController extends Controller
             ->get()
             ->pluck('id')
             ->toArray();
+
         //\Log::info($inner_channels);
         $users = User::where('openid',$openid)->select('id','distribution_channel_id')->get();
         \Log::info('users:openid:'.$openid);