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

app/Repositories/CategoryRepository.php

@@ -25,6 +25,7 @@ class CategoryRepository {
             $where [] = ['is_suggest', 1];
             $data = [];
         }else{
+            $where [] = ['is_open', 1];
             $data = [
                 [
                     'id' => -2,
@@ -38,7 +39,7 @@ class CategoryRepository {
                 ]
             ];
         }
-        $categories =  $this->category->select('id', 'name', 'img')->where($where)->limit(50)->get()->toArray();
+        $categories =  $this->category->select('id', 'name', 'img')->where($where)->orderBy('sort', 'asc')->limit(50)->get()->toArray();
         return array_merge($data, $categories);
     }
     //获取多个话题

app/Repositories/PostRepositories.php

@@ -558,18 +558,23 @@ class PostRepositories
 
         $where = [];
         $topic = $this->topic;
+        if(isset($request['name'])){
+            $where[] = ['topic.name', 'like', "%{$request['name']}%"];
+        }
+
         if(isset($request['category_id']) && $request['category_id']){
             if($request['category_id'] == -2){
                 $where[] = ['topic.is_hot', 1];
             }else{
-                $topic = $topic->join('category_topic', 'category_topic.topic_id', '=', 'topic.id')->select('topic.*');
+                $topic = $topic->join('category_topic', 'category_topic.topic_id', '=', 'topic.id')->select('topic.*','category_topic.id as cid');
                 $where[] = ['category_topic.category_id', $request['category_id']];
+                return $topic
+                    ->where($where)
+                    ->orderBy('cid','asc')
+                    ->paginate($perPage);
             }
         }
 
-        if(isset($request['name'])){
-            $where[] = ['topic.name', 'like', "%{$request['name']}%"];
-        }
         return $topic
             ->where($where)
             ->orderBy('id','desc')