1

application/index/service/UserAgentService.php

@@ -77,7 +77,7 @@ class UserAgentService
     {
         $params['user_id'] = $user_id;
 
-        $field = 'd.name as site_name,c.agent_name,c.agent_phone';
+        $field = 'd.name as site_name,c.name as agent_name,c.phone as agent_phone';
         $user_agent_info = $this->m_user_agent->selectUserAgent($field,$params);
         if(!$user_agent_info){
             return false;

application/index/service/UserLogService.php

@@ -120,7 +120,7 @@ class  UserLogService
         //客方
         $s_user_agent = new UserAgentService();
         $user_agent_res = $s_user_agent->selectUserAgent($user_id);
-        $result['customer_relegation_list'] = $user_agent_res;
+        $result['customer_relegation_list'] = $user_agent_res ? $user_agent_res : null;
 
         return ["code" => 200, "data" => $data];
     }
@@ -422,7 +422,8 @@ class  UserLogService
         //客方
         $s_user_agent = new UserAgentService();
         $user_agent_res = $s_user_agent->selectUserAgent($user_id);
-        $result['customer_relegation_list'] = $user_agent_res;
+        $result['customer_relegation_list'] = $user_agent_res ? $user_agent_res : null;
+
 
         // 是否转介绍
         $result['referrer_source'] = $user_result['referrer_source'];

application/index/service/UserService.php

@@ -118,10 +118,11 @@ class UserService
 //            $this->setUserSites($id, $data['site_id']);//设置站点
 
             //操作完成之后判断下是什么动作
-            if ($type == 'add') {
+            $user_agent_res = $s_user_agent->findUserAgent($site_id,0,$id);
+            if (!$user_agent_res) {
                 $s_user_agent->addUserAgent($data['agent_id'],$id,$site_id);
             }else{
-                if (!empty($data['agents_id'])) {
+                if (!empty($data['agents_id']) && ($data['agents_id'] != $agent_id_old)) {
                     $s_user_agent->changeUserAgent($data['agent_id'],$id,$site_id);
                 }
             }

application/model/UserAgentModel.php

@@ -30,7 +30,7 @@ class UserAgentModel extends Model
      */
     public function getUserAgent($field,$params)
     {
-        $params["is_del"] = 0;
+        $params["a.is_del"] = 0;
         $result = $this->db_
             ->field($field)
             ->alias('a')
@@ -44,7 +44,7 @@ class UserAgentModel extends Model
 
     public function selectUserAgent($field,$params)
     {
-        $params["is_del"] = 0;
+        $params["a.is_del"] = 0;
         $result = $this->db_
             ->field($field)
             ->alias('a')