1

application/api_broker/controller/Shop.php

@@ -198,10 +198,15 @@ class Shop extends Basic
 
                 //我的商铺 代表我是盘方的商铺
                 if (isset($params['agent_id'])) {
+                    big_log($params['agent_id']);
                     $verifyService = new VerifyService();
                     $ids = $verifyService->getPanpartyByAgentId($params['agent_id']);
                     //$conditions['upload_id'] = array( "eq", $params['agent_id'] );
                     $conditions['id'] = array("in", $ids);
+                    if (isset($params['site_name']) && $params['site_name']) {
+                        //城市筛选
+                        $conditions['city'] = $params['site_name'];
+                    }
 
                 }
 
@@ -274,7 +279,7 @@ 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"); //只显示上架或下架的
         }