Merge remote-tracking branch 'origin/develop' into develop

app/Repositories/FeedRepositories.php

@@ -120,24 +120,33 @@ class FeedRepositories
             ->orderBy('id','desc')
             ->paginate($perPage);
         if($data){
-            foreach ($data as &$value){
+            foreach ($data as $key=>&$value){
                 if($value['type'] == 6){
                     $post = $this->postRepositories->detail($value['relate_id']);
-                    $value['relate_data'] = $this->postDetail($post,$value['follow_uid'], $userInfo);
+                    if($post){
+                        $value['relate_data'] = $this->postDetail($post,$value['follow_uid'], $userInfo);
+                    }else{
+                        unset($data[$key]);
+                    }
                 }
                 if($value['type'] == 5){
                     $value['content'] = null;
                     $relate_data = $this->getFollowMemberFans($value['relate_id']);
-                    if(!empty($relate_data['username'])){
-                        $relate_data['username'] = subtext($relate_data['username'],10);
+                    if($relate_data){
+                        if(!empty($relate_data['username'])){
+                            $relate_data['username'] = subtext($relate_data['username'],10);
+                        }
+                        $value['relate_data'] = $relate_data;
+                    }else{
+                        unset($data[$key]);
                     }
-                    $value['relate_data'] = $relate_data;
                 }
             }
         }
         return $data;
     }
     public function postDetail($post,$follow_uid,$userInfo){
+        Log::debug('feed流内容--'.json_encode($post));
         $uid = $userInfo['uid'];
         $imgs = [];
         foreach($post->imgs as $img){