合并分支 'heshupeng' 到 'master'

论坛bug



查看合并请求 !192

@@ -150,9 +150,10 @@ class Topic extends Api
         $where['status'] = '1'; //审核通过的显示 
         if(!empty($topic_category_id)){
             $where['topic_category_id'] = $topic_category_id;
-        }else{
-            $where['is_recommend'] = '1';
         }
+//        else{
+//            $where['is_recommend'] = '1';
+//        }
         switch ($order) {
             case 0:
                 $order = ['createtime' => 'desc'];