1

application/api_broker/controller/Shop.php

@@ -202,9 +202,6 @@ class Shop extends Basic
                     $ids = $verifyService->getPanpartyByAgentId($params['agent_id']);
                     //$conditions['upload_id'] = array( "eq", $params['agent_id'] );
                     $conditions['id'] = array("in", $ids);
-                    if(!empty($params["city"])){
-                        $conditions["city"] = $params["city"];
-                    }
                 }
 
                 $area_start = isset($params['shop_area_start']) ? $params['shop_area_start'] : -1;
@@ -276,11 +273,15 @@ class Shop extends Basic
 
         //如果有传经纪人id则代表我的商铺不区分状态
         if (isset($params['agent_id'])) {
-            // unset($conditions["city"]);
+            unset($conditions["city"]);
             //$conditions['status'] = array( 'in', "1,2" ); //只显示上架或下架的
             $conditions['status'] = !empty($params['status']) ? $params['status'] : array('in', "1,2"); //只显示上架或下架的
         }
 
+        if(!empty($params["site_name"])){
+            $conditions["city"] = $params["site_name"];
+        }
+
         $result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
 
         // $m_business_district = new GBusinessDistrict();