From 5df6092f056fce5f4dd4b99a71cae07b1c88feb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Sun, 1 May 2022 13:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/agent/controller/Account.php | 3 +--
 app/agent/controller/Order.php   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/agent/controller/Account.php b/app/agent/controller/Account.php
index 1bd4646..2075425 100644
--- a/app/agent/controller/Account.php
+++ b/app/agent/controller/Account.php
@@ -20,8 +20,7 @@ class Account extends Controller
             $page = ($_GET['PageIndex'] - 1) * 50;
         }
         $where = [];
-        $where_str = ' agent_id='.$agent_id.' ';
-        $where['UserCode'] = $agent_phone;
+        $where_str = ' (UserCode='.$agent_phone.' OR agent_id='.$agent_id.') ';
 
         //处理筛选
         if($get_data['UserId'] != 0){
diff --git a/app/agent/controller/Order.php b/app/agent/controller/Order.php
index 3bb5e96..70162cc 100644
--- a/app/agent/controller/Order.php
+++ b/app/agent/controller/Order.php
@@ -21,8 +21,7 @@ class Order extends Controller
         }
         $where = [];
         $where_str = '';
-        $where['UserName'] = $agent_phone;
-        $where_str = ' agent_id='.$agent_id.' ';
+        $where_str = ' (UserName='.$agent_phone.' OR agent_id='.$agent_id.') ';
 
         if(!empty($get_data['ProductIds'])){
             $where['ProductId'] = $get_data['ProductIds'];