1

application/api_broker/controller/CollectHouse.php

@@ -127,7 +127,11 @@ class CollectHouse extends Basic
         $get_params['agents_id']    = $params["agents_id"];
         $get_params['CollectUser.status']       = 1;
 
-
+        if(empty($params["city"])){
+            $conditions["Houses.city"] = trim($this->city);
+        }else{
+            $conditions["Houses.city"] = $params["city"];
+        }
 
         $res        = $this->aCollectHouse->getCollectList($pageNo,$pageSize,$field,$get_params);
         $res_total  = $this->aCollectHouse->getCollectListTotal($field,$get_params);

application/api_broker/controller/OfficeCollectHouse.php

@@ -132,6 +132,13 @@ class OfficeCollectHouse extends Basic
 
         $get_params['agents_id']    = $params["agents_id"];
         $get_params['CollectUser.status']       = 1;
+
+        if(empty($params["city"])){
+            $conditions["Houses.city"] = trim($this->city);
+        }else{
+            $conditions["Houses.city"] = $params["city"];
+        }
+
         $res        = $this->aCollectHouse->getCollectList($pageNo,$pageSize,$field,$get_params);
         $res_total  = $this->aCollectHouse->getCollectListTotal($field,$get_params);
         $look_shop_service = new LookShopService();