1

application/index/controller/UserLog.php

@@ -74,12 +74,19 @@ class UserLog extends Basic{
                "type" => 1,
               );*/
 
-        if (!isset($params['user_id']) || !isset($params['type'])) {
-            return $this->response("101", "参数不全");
+        $checkResult = $this->validate($params, "UserLogValidate.userLog");
+        if (true !== $checkResult) {
+            return $this->response(101, $checkResult);
         }
+
         $user_id  = $params['user_id'];
         $type     = $params['type'];
-        $result = $this->service_->userLog($user_id,$this->siteId,$type);
+
+        if($params['entrust_type'] == 1){
+            $result = $this->OfficeUserLogService->userLog($user_id,$this->siteId,$type);
+        }else{
+            $result = $this->service_->userLog($user_id,$this->siteId,$type);
+        }
 
         if(count($result) > 0){
             return $this->response("200", "success！", $result);

application/index/validate/UserLogValidate.php

@@ -13,8 +13,9 @@ use think\Validate;
 class UserLogValidate extends Validate
 {
     protected $rule = [
-        'user_id'  => 'require|number|gt:0',
-        'entrust_type'  => 'require|number',
+        'user_id'      => 'require|number|gt:0',
+        'entrust_type' => 'require|number',
+        'type'         => 'require|number',
     ];
 
     protected $message = [
@@ -23,9 +24,12 @@ class UserLogValidate extends Validate
         'user_id.gt'       => 'user_id必须大于0',
         'entrust_type.require' => 'entrust_type为必填字段',
         'entrust_type.number'  => 'entrust_type只能为数字',
+        'type.require' => 'entrust_type为必填字段',
+        'type.number'  => 'entrust_type只能为数字',
     ];
 
     protected $scene = [
-        'followUpLog' => [ 'agent_id', 'entrust_type'],
+        'followUpLog' => [ 'user_id', 'entrust_type'],
+        'userLog' => [ 'user_id', 'entrust_type','type'],
     ];
 }
\ No newline at end of file