bug

application/api_broker/controller/User.php

@@ -95,7 +95,7 @@ class User extends Basic
         $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
 
-        $conditions["city"] = trim($this->city) ? trim($this->city) : '上海市';
+        //$conditions["city"] = trim($this->city) ? trim($this->city) : '上海市';
 
         if (isset($params['user_status'])) {
             $conditions['user_status'] = $params['user_status'];
@@ -156,7 +156,6 @@ class User extends Basic
         //传了经纪人id则表示我的客户
         if (isset($params["agent_id"])) {
             $conditions['agent_id'] = $params['agent_id'];
-            $is_search              = false;
             //是我的客户就显示全部
         }else{
             if($app_request_source_type == 1){
@@ -168,7 +167,9 @@ class User extends Basic
                     $time_now = date('Y-m-d H:i:s');//当前时间
                     //protect_time 将截止日期大于当前时间的数据排除掉
                     $conditions['protect_time'] = array('lt',$time_now);
-                    $conditions['site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];//默认显示经纪人所在站点的客户
+                    if(!$is_search){
+                        $conditions['site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];//默认显示经纪人所在站点的客户
+                    }
                 }
             }
         }