|
@@ -116,19 +116,19 @@ class FeedRepositories
|
|
|
->where($where)
|
|
|
->orderBy('id','desc')
|
|
|
->paginate($perPage);
|
|
|
-// if($data){
|
|
|
-// foreach ($data as $key=>$value){
|
|
|
-// if($value['type'] == 6){
|
|
|
-// $post = $this->postRepositories->detail($value['relate_id']);
|
|
|
-// $value['relate_data'] = $this->postDetail($post);
|
|
|
-// }
|
|
|
-// if($value['type'] == 5){
|
|
|
-// $value['content'] = null;
|
|
|
-// $value['relate_data'] = $this->getFollowMemberFans($value['relate_id']);
|
|
|
-// }
|
|
|
-// $data[] = $value;
|
|
|
-// }
|
|
|
-// }
|
|
|
+ if($data){
|
|
|
+ foreach ($data as &$value){
|
|
|
+ if($value['type'] == 6){
|
|
|
+ $post = $this->postRepositories->detail($value['relate_id']);
|
|
|
+ $value['relate_data'] = $this->postDetail($post);
|
|
|
+ }
|
|
|
+ if($value['type'] == 5){
|
|
|
+ $value['content'] = null;
|
|
|
+ $value['relate_data'] = $this->getFollowMemberFans($value['relate_id']);
|
|
|
+ }
|
|
|
+ //$data[] = $value;
|
|
|
+ }
|
|
|
+ }
|
|
|
return $data;
|
|
|
}
|
|
|
public function postDetail($post){
|