label_name

application/index/controller/Remark.php

@@ -182,7 +182,6 @@ class Remark extends Basic
         }
 
         $m_user = new Users();
-        $m_label  = new ULabels();
         $m_agent  = new AAgents();
 
         $code = 200;
@@ -209,7 +208,6 @@ class Remark extends Basic
         }
 
         $result_data = $follow_up_service->getPhoneFollowList($this->params['start_date'], $this->params['end_date'], $where, $this->userId);
-        $label_data = $m_label->getColumn('id,name', ['type'=>1]);  //获取标签
         if ($result_data['code'] == 200) {
             if (!empty($result_data['data'])) {
                 foreach ($result_data['data'] as $k => $v) {
@@ -224,7 +222,7 @@ class Remark extends Basic
 
                     $list[$k]['user_phone'] = substr_replace($list[$k]['user_phone'], '****', 3, 4);
                     $list[$k]['admin'] = $m_agent->getAgentsById($v['agent_id'], 'name');
-                    $list[$k]['label_name'] = array_key_exists($v['labels_id'], $label_data) ? $label_data[$v['labels_id']] : '';
+                    $list[$k]['label_name'] = $v['label_name'];
                     $list[$k]['is_outstrip_twenty_four_hours'] = $v['is_outstrip_twenty_four_hours'];
                     $list[$k]['is_outpace_call_num'] = $v['is_outpace_call_num'];
                     $list[$k]['create_time'] = $v['create_time'];

application/index/service/PhoneFollowUpService.php

@@ -10,6 +10,7 @@ namespace app\index\service;
 
 use app\api_broker\service\VerifyRepetitionService;
 use app\model\AAgents;
+use app\model\ULabels;
 use app\model\UPhoneFollowUp;
 use app\model\UPhoneFollowUpTemporary;
 use app\model\Users;
@@ -111,13 +112,15 @@ class PhoneFollowUpService
         $s_user_service = new UserService();
         $s_user_Log_service = new UserLogService();
         $m_user = new Users();
-
+        $m_label = new ULabels();
+        $label_data = $m_label->getColumn('id,name', ['type'=>1]);  //获取标签
         foreach ($data as $k => $v) {
             #客户是否在保护期内（0：保护器内 1：超过保护期）
             $data[$k]['is_outstrip_twenty_four_hours'] = $s_user_service->isUserProtect($v['user_id']);
             #判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定(0允许拨打 1不允许拨打)
             $user_res = $m_user->verifyUser('user_name,user_phone', '', [ 'id' => $v['user_id'] ]);
             $data[$k]['is_outpace_call_num'] = $s_user_Log_service->userDetailIsOutpaceCallNum($v['user_id'],$user_res['user_phone'], $agent_id);
+            $data[$k]['label_name'] = array_key_exists($v['labels_id'], $label_data) ? $label_data[$v['labels_id']] : '';
         }
 
         return ['code'=>'200','data'=>$data];