Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-service into develop

app/Repositories/FeedRepositories.php

@@ -140,6 +140,7 @@ class FeedRepositories
                         $user = $this->userInfo($value['relate_id']);
                     }
                     if($user){
+                        Log::debug("测试feed关注状态：uid{$userInfo['uid']}followUid{$value['relate_id']}");
                         $value['relate_data'] = [
                             'uid' => intval($user['uid']),
                             'username' => subtext($user['username'],10),
@@ -170,6 +171,7 @@ class FeedRepositories
             ];
         }
         $isFollow = 0;
+        Log::debug("内容feed关注uid{$uid}followUid{$follow_uid}");
         $followStatus = $this->getFollowStatus($uid, $follow_uid);
         if($followStatus){
             $isFollow = $followStatus;

app/Repositories/PostRepositories.php

@@ -420,6 +420,7 @@ class PostRepositories
         return $this->post
             ->join('post_data', 'post_data.post_id', '=', 'post.id')
             ->select('post.*')
+            ->orderBy('is_suggest','desc')
             ->orderBy('weight','desc')
             ->paginate($perPage);
     }