diff --git a/app/agent/controller/Account.php b/app/agent/controller/Account.php
index 2075425..ca98568 100644
--- a/app/agent/controller/Account.php
+++ b/app/agent/controller/Account.php
@@ -19,8 +19,10 @@ class Account extends Controller
         if (isset($_GET['PageIndex'])) {
             $page = ($_GET['PageIndex'] - 1) * 50;
         }
-        $where = [];
-        $where_str = ' (UserCode='.$agent_phone.' OR agent_id='.$agent_id.') ';
+        $where['DeleteTag'] = 0;
+        $where['agent_id']=$agent_id;
+
+        $where_str = '';
 
         //处理筛选
         if($get_data['UserId'] != 0){
@@ -38,7 +40,11 @@ class Account extends Controller
         if (!empty($_GET['Btime'])){
             $date1 = date('Y-m-d', strtotime($_GET['Btime']));
             $date2 = date('Y-m-d', strtotime($_GET['Etime']));
-            $where_str .= " AND EndTime>='" . $date1 . "' and EndTime<='" . $date2 . "' ";
+            
+            if (mb_strlen($where_str)>0){
+                $where_str .= ' AND ';
+            }
+            $where_str .= " EndTime>='" . $date1 . "' and EndTime<='" . $date2 . "' ";
         }
         if (!empty($_GET['Bktime'])){
             if (mb_strlen($where_str)>0){
@@ -56,7 +62,7 @@ class Account extends Controller
         
         $account_model = new ProductAccountModel;
         $list = $account_model->getAgentListPage($where,$where_str, '*', 'id desc', "$page,50");
-
+     
         foreach ($list as &$info){
             $endtime = strtotime($info['EndTime']);
             if($endtime <= time()){
@@ -68,7 +74,6 @@ class Account extends Controller
             $info['UserCode'] = $info['UserPhone']?$info['UserPhone']:$info['UserCode'];
         }
 
-
         $data = [
             'Code' => 10000,
             'Data' => $list,
diff --git a/app/agent/controller/Order.php b/app/agent/controller/Order.php
index 70162cc..eb900bc 100644
--- a/app/agent/controller/Order.php
+++ b/app/agent/controller/Order.php
@@ -21,7 +21,7 @@ class Order extends Controller
         }
         $where = [];
         $where_str = '';
-        $where_str = ' (UserName='.$agent_phone.' OR agent_id='.$agent_id.') ';
+        $where['agent_id']=$agent_id;
 
         if(!empty($get_data['ProductIds'])){
             $where['ProductId'] = $get_data['ProductIds'];
diff --git a/app/agent/controller/Userinfo.php b/app/agent/controller/Userinfo.php
index 80500c2..07fa170 100644
--- a/app/agent/controller/Userinfo.php
+++ b/app/agent/controller/Userinfo.php
@@ -137,8 +137,7 @@ class Userinfo extends Controller
         $where['agent_id'] = $this->userinfo['OperaterID'];
         $user_model = new UserModel;
         $discount_model = new ProductPriceScheme;
-        $user_list = $user_model->getListPage($where, '*', 'id desc', "$page,50");
-
+        $user_list = $user_model->getListPage($where, '`LoginCode`,`RestAmount`,`discount_id`,`CreateTime`,`QQ`,`Wx`,`TaoBao`,`Email`,`Id`,`id_code`,`is_verify`', 'id desc', "$page,50");
         
         //折扣列表
         $discount_data = $discount_model->getList();
@@ -150,7 +149,6 @@ class Userinfo extends Controller
         }
 
         foreach ($user_list as &$info){
-            $info['Password'] = '';
             if(empty($info['id_code'])){
                 $info['is_verify'] = '未认证';
             } else {