1

application/api_broker/controller/User.php

@@ -854,14 +854,20 @@ class User extends Basic
                 "page_no" => 1,
                 "page_size" => 15
               );*/
-        if (!isset($params['user_id'])) {
-            return $this->response("101", "参数不全");
+        $checkResult = $this->validate($params, "UserValidate.followUpLog");
+        if (true !== $checkResult) {
+            return $this->response("300", $checkResult);
         }
+
         $user_id  = $params['user_id'];
         $pageNo   = empty($params['page_no']) ? 1 : $params['page_no'];
         $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
 
-        $result = $this->userLogService->phoneFollowUp($user_id,$this->siteId,$pageNo,$pageSize);
+        if($params['entrust_type']== 0){
+            $result = $this->userLogService->phoneFollowUp($user_id,$this->siteId,$pageNo,$pageSize);
+        }else{
+            $result = $this->userLogService->phoneFollowUp($user_id,$this->siteId,$pageNo,$pageSize);
+        }
 
         if(count($result) > 0){
             return $this->response("200", "success！", $result);

application/api_broker/validate/UserValidate.php

@@ -14,7 +14,8 @@ class UserValidate extends Validate{
         'type'     => 'require',
         'agent_id' => 'require|number|gt:0',
         'user_id'  => 'require|number|gt:0',
-        'id'       => 'require|number|gt:0'
+        'id'       => 'require|number|gt:0',
+        'entrust_type'  => 'require|number',
     ];
 
     protected $message = [
@@ -28,10 +29,13 @@ class UserValidate extends Validate{
         'id.require'       => 'id为必填字段',
         'id.number'        => 'id只能为数字',
         'id.gt'            => 'id必须大于0',
+        'entrust_type.require' => 'entrust_type为必填字段',
+        'entrust_type.number'  => 'entrust_type只能为数字',
     ];
 
     protected $scene = [
         'getLastOrNextUserID'              => [ 'user_id', 'agent_id', 'type' ],
         'getLastOrNextUserIDPhoneFollowPu' => [ 'id', 'agent_id', 'type' ],
+        'followUpLog' => [ 'user_id', 'entrust_type' ],
     ];
 }