客户列表中的筛选详情中的下一条查看详情 bug

application/api_broker/controller/User.php

@@ -269,8 +269,10 @@ class User extends Basic
             $where['a.create_time'] = [ 'between time', [ $params['start_date'] . ' 00:00:00', $params['end_date'] . ' 23:59:59' ] ];
         } else {
             if (empty($params['id']) && empty($params['phone'])) {
-                $time_                  = date('Y-m-d H:i:s', strtotime("-1 day"));
-                $where['a.create_time'] = array( 'lt', $time_ );
+                //排除排除保护期内的客户
+                $time_now = date('Y-m-d H:i:s');//当前时间
+                //protect_time 将截止日期大于当前时间的数据排除掉
+                $where['a.protect_time'] = array( 'lt', $time_now );
             }
         }
 
@@ -439,12 +441,12 @@ class User extends Basic
             $where['a.province'] = $params['province'];
         }
 
-        if (!empty($params['city'])) {
+        /*if (!empty($params['city'])) {
             $where['a.city'] = $params['city'];
         } else {
             // 判断是 杭州还是上海
             $where['a.city'] = trim($this->city) ? trim($this->city) : '上海市';
-        }
+        }*/
 
         if (!empty($params['disc'])) {
             $where['a.disc'] = $params['disc'];

application/model/Users.php

@@ -902,13 +902,7 @@ class Users extends Model
                 ->select();
         }
 
-        /*$return = Db::name($this->table)
-            ->field($field)
-            ->where($where)
-            ->limit($limit)
-            ->order($order)
-            ->select();*/
-        //dump($this->getLastSql());
+        //echo $this->getLastSql();
         return $result;
     }