Commit d9ebd2d2 authored by zhuwei's avatar zhuwei

1

parent 867bf5c4
...@@ -734,7 +734,8 @@ class User extends Basic ...@@ -734,7 +734,8 @@ class User extends Basic
$pageSize = empty($params['page_size']) ? 15 : $params['page_size']; $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
if(isset($params['entrust_type']) && ($params['entrust_type']== 1)){ if(isset($params['entrust_type']) && ($params['entrust_type']== 1)){
$result = $this->OfficeUserLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize); // $result = $this->OfficeUserLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize);
return $this->response("200", "success!", null);
}else{ }else{
$result = $this->userLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize); $result = $this->userLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize);
} }
......
...@@ -10,7 +10,7 @@ use app\model\OfficeGBuilding; ...@@ -10,7 +10,7 @@ use app\model\OfficeGBuilding;
use think\Log; use think\Log;
/** /**
* 批量处理控制器(数据库一些数据需要批量处理下) * 拉取经纬度
* Class BatchProcessing * Class BatchProcessing
* @package app\index\controller * @package app\index\controller
*/ */
......
...@@ -119,7 +119,7 @@ class UserLog extends Basic{ ...@@ -119,7 +119,7 @@ class UserLog extends Basic{
if($params['entrust_type'] == 1){ if($params['entrust_type'] == 1){
$result = $this->OfficeUserLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize); return $this->response("200", "success!", '');
}else{ }else{
$result = $this->service_->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize); $result = $this->service_->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment