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

application/api_broker/controller/Client.php

@@ -49,22 +49,21 @@ class Client extends Basic
             if ($this->request->isPost()) {
                 if (!empty($this->params['id'])) {
 
+                    $user_agent_id = $this->user->getUserById('agent_id', $this->params['id']); //查询原始客方
+                    //编辑
+                    $data['start'] = $this->user->edit($this->params, $this->params['id']);
+
                     //是否修改客方
-                    if ($this->params['agents_id'] != $this->params['ccr_id']) {
+                    if ($this->params['agents_id'] != $user_agent_id['agent_id']) {
                         $agent = new AAgents();
                         $agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
                         $remark = '修改为'.$agent_data['name'].'-'.$agent_data['phone'];
 
                         $push = new PushMessageService();
                         $content = "【你的客户客方被修改为{$agent_data['name']}-{$agent_data['phone']}】";
-
-                        $user_agent_id = $this->user->getUserById('agent_id', $this->params['id']);
                         $push->pushMessageById($user_agent_id['agent_id'], '客方修改', $content);
                         $this->operating_records($this->params['ccr_id'], $type=3, $remark,0,$this->params['id']);
                     }
-                    //编辑
-                    $data['start'] = $this->user->edit($this->params, $this->params['id']);
-
                 } else {
                     $table = new AAgents();