Merge remote-tracking branch 'origin/test' into test

application/api_broker/controller/Shop.php

@@ -188,7 +188,7 @@ class Shop extends Basic
         //如果有传经纪人id则代表我的商铺不区分状态
         if (isset($params['agent_id'])) {
             //$conditions['status'] = array( 'in', "1,2" ); //只显示上架或下架的
-            $conditions['status'] = $params['status']; //只显示上架或下架的
+            $conditions['status'] = !empty($params['status']) ? $params['status'] : array( 'in', "1,2" ); //只显示上架或下架的
         }
         $result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
         //获取图片信息