bug

application/api_broker/controller/Shop.php

@@ -114,21 +114,6 @@ class Shop extends Basic
             $conditions['internal_address'] = array( "like", "%" . trim($params['address']) . "%" );
         }
 
-        $houseIds = "";
-
-        if (isset($params['house_id'])) {
-            $houseIds = $params['house_id'];
-        } else {
-            if (isset($params['landlord_phone'])) {
-                $houseIds = $this->returnHouseId($params['landlord_phone']);
-                if (empty($houseIds)) {
-                    return $this->response("200", "此条件没有找到数据");
-                }
-            }
-        }
-        if (!empty($houseIds)) {
-            $conditions['id'] = array( "in", $houseIds );
-        }
 
         if (isset($params['start_time']) && isset($params['end_time'])) {
             $start_time                = date('Y-m-d H:i:s', $params['start_time']);
@@ -213,6 +198,23 @@ class Shop extends Basic
                 $conditions['status'] = !empty($params['status']) ? $params['status'] : array( 'in', "1,2" ); //b端搜索显示上架下架的
             }
         }
+
+        $houseIds = "";
+
+        if (isset($params['house_id'])) {
+            $houseIds = $params['house_id'];
+        } else {
+            if (isset($params['landlord_phone'])) {
+                $houseIds = $this->returnHouseId($params['landlord_phone']);
+                if (empty($houseIds)) {
+                    return $this->response("200", "此条件没有找到数据");
+                }
+            }
+        }
+        if (!empty($houseIds)) {
+            $conditions['id'] = array( "in", $houseIds );
+        }
+
         //如果有传经纪人id则代表我的商铺不区分状态
         if (isset($params['agent_id'])) {
             unset($conditions["city"]);