客户列表搜索去除跟进内容搜索

application/index/controller/Member.php

@@ -106,23 +106,23 @@ class Member extends Basic{
                 }
             }
 
-            //跟进结束时间
-            if (!empty($params['follow_start']) && empty($params['follow_end'])) {
-                $where['b.create_time'] = ['> time',$params['follow_start']. ' 00:00:00'];
-                $type = 2;
-            }
-
-            //跟进时间
-            if (!empty($params['follow_end']) && empty($params['follow_start'])) {
-                $where['b.create_time'] = ['< time',$params['follow_end']. ' 23:59:59'];
-                $type = 2;
-            }
-
-            //跟进时间
-            if (!empty($params['follow_start']) && !empty($params['follow_end'])) {
-                $where['b.create_time'] = ['between time', [$params['follow_start']. ' 00:00:00', $params['follow_end'] . ' 23:59:59']];
-                $type = 2;
-            }
+//            //跟进结束时间
+//            if (!empty($params['follow_start']) && empty($params['follow_end'])) {
+//                $where['b.create_time'] = ['> time',$params['follow_start']. ' 00:00:00'];
+//                $type = 2;
+//            }
+
+//            //跟进时间
+//            if (!empty($params['follow_end']) && empty($params['follow_start'])) {
+//                $where['b.create_time'] = ['< time',$params['follow_end']. ' 23:59:59'];
+//                $type = 2;
+//            }
+//
+//            //跟进时间
+//            if (!empty($params['follow_start']) && !empty($params['follow_end'])) {
+//                $where['b.create_time'] = ['between time', [$params['follow_start']. ' 00:00:00', $params['follow_end'] . ' 23:59:59']];
+//                $type = 2;
+//            }
 
             //客户编号
             if (!empty($params['id'])) {
@@ -157,7 +157,6 @@ class Member extends Basic{
             //注册时间
             if (!empty($params['registration_start']) && !empty($params['registration_end'])) {
                 $where['a.registration_time'] = ['between time', [$params['registration_start']. ' 00:00:00', $params['registration_end'] . ' 23:59:59']];
-                $type = 2;
             }
 
             //业态
@@ -307,9 +306,6 @@ class Member extends Basic{
                     if ($is_show) {
                         array_push($list, $data_list[$k]);
                     }
-
-
-
                 }
                 $data['list']  =$list;
                 $data['total'] = $this->user->getUserAgentTotal($where, $type);

application/model/Users.php

@@ -161,9 +161,6 @@ class Users extends Model
      * @param $params
      * @param int $type
      * @return int|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
      */
     public function getUserAgentTotal($params, $type = 0)
     {
@@ -171,12 +168,13 @@ class Users extends Model
             $result = $this->alias('a')
                 ->where($params)
                 ->count();
-        } elseif ($type == 2) {
+        } /*elseif ($type == 2) {
             $result = $this->alias('a')
                 ->join('u_phone_follow_up b', 'a.id = b.user_id', 'left')
                 ->where($params)
                 ->count();
-        } elseif ($type == 3) {
+        } */
+        elseif ($type == 3) {
             $result = $this->alias('a')
                 ->join('a_agents b', 'a.agent_id = b.id', 'left')
                 ->where($params)