excel增加字段

application/admin/controller/User.php

@@ -44,7 +44,7 @@ class User extends AuthBase
 
         $user_model = model('user');
         $user_list = $user_model->where($condition)->order('created_at desc')
-            ->paginate(10,'false',['query'=>['nickname'=>$nickname,'is_vip'=>$is_vip,'start_time'=>$start_time,'end_time'=>$end_time,'phone'=>$phone]]);
+            ->paginate(10,false,['query'=>['nickname'=>$nickname,'is_vip'=>$is_vip,'start_time'=>$start_time,'end_time'=>$end_time,'phone'=>$phone]]);
         //把编号字符串分割
         foreach($user_list as &$v){
             $numberArr = str_split($v['vip_number'], 4);
@@ -64,9 +64,7 @@ class User extends AuthBase
             $condition['nickname'] = ['like','%'.$nickname.'%'];
         }
         if($is_vip){
-            $condition['vip_endtime'] = ['>=',date('Y-m-d H:i:s',time())];
-        }else{
-            $condition['vip_endtime'] = ['<',date('Y-m-d H:i:s',time())];
+            $condition['is_vip'] = $is_vip;
         }
         if($start_time&&$end_time){
             $condition['created_at'] = ['between',[$start_time.' 00:00:00',$end_time.' 00:00:00']];
@@ -77,7 +75,7 @@ class User extends AuthBase
                 $condition['created_at'] = ['<',$end_time.' 00:00:00'];
             }
         }
-        $user_list = model('user')->where($condition)->field('name,wx_number,nickname,gender,phone,is_vip,created_at,updated_at,vip_endtime')->select();
+        $user_list = model('user')->where($condition)->field('nickname,gender,phone,is_vip,created_at,updated_at,vip_endtime')->select();
         $mulit_arr = [];
         $mulit_arr['data'] = [];
         $cont = [['昵称','性别','电话','是否是会员','注册时间','更新时间','会员到期时间']];
@@ -104,7 +102,7 @@ class User extends AuthBase
             $arr[] = $vo['is_vip']==0?'否':'是';
             $arr[] = $vo['created_at'];
             $arr[] = $vo['updated_at'];
-            $arr[] = $vo['vip_endtime']?$vo['vip_endtime']:'';
+            $arr[] = $vo['vip_endtime'];
             $cont[] = $arr;
         }
         $mulit_arr['data'][] =$cont;