diff --git a/app/manager/controller/UserFollow.php b/app/manager/controller/UserFollow.php
index 29f9e74..113fa70 100644
--- a/app/manager/controller/UserFollow.php
+++ b/app/manager/controller/UserFollow.php
@@ -5,7 +5,7 @@
  * @Author: kangkang
  * @Date: 2020-10-13 19:52:37
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2020-11-28 16:40:47
+ * @LastEditTime: 2021-11-16 16:36:54
  */
 
 namespace app\manager\controller;
@@ -248,7 +248,7 @@ class UserFollow extends Controller
         $id = $_GET['id'];
         $follow_rcord = new FollowRecord;
         $manager_model = new Manager;
-        $data = $follow_rcord->getNewRecord(['user_id' => $id]);
+        $data = $follow_rcord->getNewRecord(['user_id' => $id],'10');
         $list = [];
         foreach ($data as $info){
             $manager_info = $manager_model->getOne(['id'=>$info['op_user']],'RealName');
@@ -258,6 +258,42 @@ class UserFollow extends Controller
         \result($list);
     }
 
+    public function getAllFollowRecord()
+    {
+        $get = $_GET['data'];
+        $page = 0;
+        $page = ($get['PageIndex'] - 1) * 50;
+        //超级管理员
+        $super_manager_list = [282,993];
+        $user_enum = new UserEnum;
+        $manager_id = $this->userinfo['OperaterID'];
+        $follow_rcord = new FollowRecord;
+        $where = '';
+        //只查询当前管理员操作的记录
+        if (!in_array($manager_id,$super_manager_list)){
+            $where .= "'op_user='". $manager_id ."'";
+        }
+        //根据日期查询
+        if (!empty($get['s_time'])) {
+            $date1 = date('Y-m-d', strtotime($get['s_time']));
+            $date2 = date('Y-m-d H:i:s', strtotime($get['e_time']));
+            $where .= " create_time>='" . $date1 . "' and create_time<='" . $date2 . "' ";
+        }
+        $list = $follow_rcord->getNewRecord($where,"$page,50");
+
+        foreach ($list as &$info) {
+            $info['follow_status']=$user_enum::$FollowStatus[$info['follow_status']];
+        }
+
+        $data = [
+            'Code' => 10000,
+            'Data' => $list,
+            'TotalCount' => (int)$follow_rcord->getCount($where)['count'],
+            'types' => $user_enum->getFormatList($user_enum::$FollowStatus),
+        ];
+        echo json_encode($data);
+    }
+
     /**
      * @description: 更改跟进状态
      * @param {*}
diff --git a/app/manager/model/FollowRecord.php b/app/manager/model/FollowRecord.php
index b4ad7c4..daf2563 100644
--- a/app/manager/model/FollowRecord.php
+++ b/app/manager/model/FollowRecord.php
@@ -14,9 +14,9 @@ class FollowRecord extends Model
      * @param {*}
      * @return {*}
      */
-    public function getNewRecord($where)
+    public function getNewRecord($where,$limit = '3')
     {
-        return $this->where($where)->order()->limit('3')->fetchAll();
+        return $this->where($where)->order()->limit($limit)->fetchAll();
     }
 
     /**