1

application/api_broker/controller/User.php

@@ -198,20 +198,23 @@ class User extends Basic
         // big_log(json_encode($conditions));
         if ($app_request_source_type == 0) {
             $pageNo   = 1;
-            $pageSize = 15;
+            $pageSize = 30;
         }
-
+        // dump($pageNo);
+        // dump($pageSize);
         $field = "id as user_id,sex,user_name,city,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand,vip,user_label,source_intro,site_ids";
         $return_user_list = $this->userModel->selectUserList($field, $conditions, $pageNo, $pageSize, "id desc");
         if (empty($return_user_list)) {
             return $this->response("200", "此条件没有找到数据");
         }
         // big_log(json_encode($return_user_list));
+        // dump($return_user_list);
 
         // 将经纪人所在城市的客户拍前面
         if ($app_request_source_type == 0) {
             $return_user_list = $this->userSequenceByCity($return_user_list,$params['site_id']);
         }
+        // dump($return_user_list);
 
 
         $clientService = new ClientService();
@@ -266,12 +269,15 @@ class User extends Basic
         foreach ($user_list as $k => $v) {
             $site_ids_arr = explode(',', $v['site_ids']);
             if (in_array($site_id, $site_ids_arr)) {
-                $user_list_temp[] = $v;
+                $user_list_temp[] = $user_list[$k];
                 unset($user_list[$k]);
             }
         }
 
-        return $user_list_temp + $user_list;
+//         dump(count($user_list_temp));
+//         dump(count($user_list));
+// exit;
+        return array_merge($user_list_temp,$user_list);
     }