bug

application/api_broker/controller/User.php

@@ -78,14 +78,14 @@ class User extends Basic
                     "pageSize"       => 15,
                     "status"         => 0,
                 );*/
-        $field = "id as user_id,sex,user_name,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand,vip";
+        $field = "id as user_id,sex,user_name,city,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand,vip";
 
         $conditions = [];
 
         $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
 
-        $conditions["city"] = trim($this->city);
+        $conditions["city"] = trim($this->city)?trim($this->city):'上海市';
 
         if (isset($params['user_status'])) {
             $conditions['user_status'] = $params['user_status'];
@@ -143,6 +143,7 @@ class User extends Basic
         }
 
         $userList = $this->userModel->selectUserList($field, $conditions, $pageNo, $pageSize, "id desc");
+        //dump($userList);
         if (empty($userList)) {
             return $this->response("200", "此条件没有找到数据");
         }
@@ -159,6 +160,7 @@ class User extends Basic
             }
         }
 
+
         foreach ($list as $k => $v) {
                 //判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
                 $is_outstrip_twenty_four_hours = 0;

application/index/controller/PerformanceInfo.php

@@ -163,7 +163,7 @@ class PerformanceInfo extends Basic
         $field .= 'Obargain.practical_fee';
         $return  = $this->oBargainModel->performancelInfoExcel($where,$field);
         if(!$return){
-            return $this->response("101","Session读取失败");
+            return $this->response("101","无数据");
         }
 
         $export = new ExportExcelUntil();