1

application/api_broker/controller/User.php

@@ -7,6 +7,7 @@ use app\api_broker\service\CallPhoneService;
 use app\api_broker\service\ClientService;
 use app\api_broker\service\UserExpiredTimeService;
 use app\api_broker\service\VipService;
+use app\index\service\OfficeUserLogService;
 use app\index\service\UserLogService;
 use app\index\service\UserService;
 use app\model\AAgents;
@@ -29,13 +30,14 @@ class User extends Basic
 {
     private $userModel;
     private $userLogService;
+    private $OfficeUserLogService;
 
     public function __construct($request = null)
     {
         parent::__construct($request);
         $this->userModel = new Users();
         $this->userLogService = new UserLogService();
-
+        $this->OfficeUserLogService = new OfficeUserLogService();
     }
 
     /**
@@ -863,8 +865,8 @@ class User extends Basic
         $pageNo   = empty($params['page_no']) ? 1 : $params['page_no'];
         $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
 
-        if($params['entrust_type']== 0){
-            $result = $this->userLogService->phoneFollowUp($user_id,$this->siteId,$pageNo,$pageSize);
+        if(isset($params['entrust_type']) && ($params['entrust_type']== 1)){
+            $result = $this->OfficeUserLogService->phoneFollowUp($user_id,$this->siteId,$pageNo,$pageSize);
         }else{
             $result = $this->userLogService->phoneFollowUp($user_id,$this->siteId,$pageNo,$pageSize);
         }

application/api_broker/validate/UserValidate.php

@@ -36,6 +36,6 @@ class UserValidate extends Validate{
     protected $scene = [
         'getLastOrNextUserID'              => [ 'user_id', 'agent_id', 'type' ],
         'getLastOrNextUserIDPhoneFollowPu' => [ 'id', 'agent_id', 'type' ],
-        'followUpLog' => [ 'user_id', 'entrust_type' ],
+        'followUpLog' => [ 'user_id' ],
     ];
 }