|
@@ -123,15 +123,19 @@ class FeedRepositories
|
|
|
foreach ($data as &$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);
|
|
|
+ }
|
|
|
}
|
|
|
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;
|
|
|
}
|
|
|
- $value['relate_data'] = $relate_data;
|
|
|
}
|
|
|
}
|
|
|
}
|