log error edit

application/chat/controller/AppChat.php

@@ -87,12 +87,10 @@ class AppChat extends Basic
         $user_id = $params['user_id'];
         $mobile  = $params['mobile'];
         $source  = $params['source'];
-<<<<<<< HEAD
-=======
+
         if (!$user_id || !$mobile || !$source) {
             return $this->response(ErrorCodeConst::ERROR_CODE_PARAM_NOT_EXIST, "请求参数错误");
         }
->>>>>>> test-hujun1.15-111
 
         $only_arr = $this->_chat->register($user_id, $mobile, $source);
 
@@ -169,11 +167,6 @@ class AppChat extends Basic
         } else {
             return $this->response("101", "", [ "msg" => "消息内容错误" ]);
         }
-<<<<<<< HEAD
-=======
-
-
->>>>>>> test-hujun1.15-111
     }
 
 

application/index/controller/BusinessDistrict.php

@@ -118,6 +118,9 @@ class BusinessDistrict extends Basic
     public function regions() {
         $params = $this->request->param();
         $regions = new Regions();
+        $params['code'] = empty($params['code'])? $params['code'] : '';
+        $params['parent_code'] = empty($params['parent_code'])? $params['parent_code'] : '';
+        $params['type'] = empty($params['type'])? $params['type'] : '';
         $data = $regions->getRegions($params['code'], $params['parent_code'], $params['type']);
         return $this->response(200, '', $data);
     }

application/index/controller/District.php

@@ -32,8 +32,10 @@ class District extends Basic
         $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
         $agents = new ADistrict();
 
-        $where  = '';
-        $join = 0;
+        $where = '';
+        $join  = 0;
+        $field = '';
+
         if ($this->params['search'] != NULL) {
             $field  = 'a.id,a.district_name,a.create_time,b.name,b.phone';
             $where .= "a.status=0 AND (phone like '{$this->params['search']}%' or name like '{$this->params['search']}%')";

application/index/controller/Houses.php

@@ -104,17 +104,17 @@ class Houses extends Basic
         }
 
         /*所在城市*/
-        if ($this->params['city'] != NULL) {
+        if (!empty($this->params['city'])) {
             $where['city'] = $this->params['city'];
         }
 
         /*所在区*/
-        if ($this->params['disc'] != NULL) {
+        if (!empty($this->params['disc'])) {
             $where['disc'] = $this->params['disc'];
         }
 
         /*状态 0待审批  1上架 2下架 3回收*/
-        if ($this->params['status'] != NULL) {
+        if (!empty($this->params['status'])) {
             $where['status'] = $this->params['status'];
         }
 
@@ -172,7 +172,7 @@ class Houses extends Basic
         //案场权限人搜索
         if (empty($params['dish'])) {
             /*楼盘编号*/
-            if ($params['id'] != NULL) {
+            if (!empty($params['id'])) {
                 $where['id'] = $params['id'];
             }
             $where['status'] = ['<>',3];

application/model/Users.php

@@ -65,7 +65,7 @@ class Users extends Model
     public function getUserAgent($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $fields = '*', $params = '') {
 
         $data = array();
-        if ($params['invite']) {
+        if (!empty($params['invite'])) {
             unset($params['invite']);
             $id = $this->field('id')->where('user_phone','LIKE',$params['user_phone']['1'].'%')->find();
             unset($params['user_phone']);
@@ -104,8 +104,8 @@ class Users extends Model
                 $data[$k]['phone']    = $user_data->user_phone;
             } else {
                 $agent_data = $agents->field('realname,phone')->where('id',$data[$k]['referrer_id'])->find();
-                $data[$k]['realname'] = $agent_data->realname;
-                $data[$k]['phone']    = $agent_data->phone;
+                $data[$k]['realname'] = isset($agent_data->realname) ? $agent_data->realname : "";
+                $data[$k]['phone']    = isset($agent_data->phone) ? $agent_data->phone : "";
             }
         }
         return $data;
@@ -120,7 +120,7 @@ class Users extends Model
      * @throws \think\exception\DbException
      */
     public function getUserAgentTotal($params) {
-        if ($params['invite']) {
+        if (!empty($params['invite'])) {
             unset($params['invite']);
             $id = $this->field('id')->where('user_phone','LIKE',$params['user_phone']['1'].'%')->find();
             unset($params['user_phone']);