Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

application/api_broker/controller/Client.php

@@ -261,7 +261,7 @@ class Client extends Basic
             return $this->response("300", "参数不全", [ 'remote_groupid' => '' ]);
         }
 
-        $phone_or_name      = trim($params['phone_or_name']);
+        $phone_or_name      = empty($params['phone_or_name']) ? "" : trim($params['phone_or_name']);
         $pagenum            = isset($params['pagenum']) ? $params['pagenum'] : 1;
         $pagesize           = 15;
         $user_id            = $params['user_id'];

application/api_broker/controller/Supervise.php

@@ -31,17 +31,17 @@ class Supervise extends Basic
 
         $data['id'] = '';
         $data['user_id'] = $this->agentId;
-        $data['usertable'] = $this->params['usertable'];
+        $data['usertable'] = empty($this->params['usertable'])? "" : $this->params['usertable'];
         $data['visitor'] = $this->agentPhone;
         $data['visitor_name'] = $this->agentName;
-        $data['agentshopname'] = $this->params['agentshopname'];
-        $data['leader_name'] = $this->params['leader_name'];
-        $data['leader_phone'] = $this->params['leader_phone'];
+        $data['agentshopname'] = empty($this->params['agentshopname']) ? '' : $this->params['agentshopname'];
+        $data['leader_name'] = empty($this->params['leader_name']) ? '': $this->params['leader_name'];
+        $data['leader_phone'] = empty($this->params['leader_phone']) ? '' : $this->params['leader_phone'];
         $data['address'] = $this->params['address'];
         $data['remarks'] = $this->params['remarks'];
         $data['longitude'] = $this->params['longitude'];
         $data['latitude'] = $this->params['latitude'];
-        $data['distance'] = $this->params['distance'];
+        $data['distance'] = empty($this->params['distance']) ? '' : $this->params['distance'];
         $data['shop_id'] = $this->params['shop_id'];
         $data['modified'] = date('Y-m-d H:i:s');
 

application/api_broker/extend/Basic.php

@@ -90,7 +90,7 @@ class Basic extends Controller
             $this->authToken  = $this->params['AuthToken'];
             $this->agentId    = $result->data->id;
             $this->agentPhone = $result->data->phone;
-            $this->agentName  = $result->data->name;
+            $this->agentName  = isset($result->data->name) ? $result->data->name : "";
             $this->timeStamp_ = $result->timeStamp_;
         }
         $requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1];