Merge branch 'test'

application/api_broker/controller/Feed.php

@@ -33,8 +33,17 @@ class Feed extends Basic
             $where_0['type'] = 1;
             $where_1['status'] = 0;
             $where_1['type'] = 0;
-            $data[] = $push->getFeedInfo($field, $where_0, 'id desc');
-            $data[] = $push->getFeedInfo($field, $where_1, 'id desc');
+            $feed   = $push->getFeedInfo($field, $where_0, 'id desc');
+            $notice = $push->getFeedInfo($field, $where_1, 'id desc');
+
+            if ($feed) {
+                $data[] = $feed;
+            }
+
+            if ($notice) {
+                $data[] = $notice;
+            }
+
         } else {
             //列表页
             $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];