From 5e97015a728b0732f0bd4ad914535ec9dbc87828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 28 May 2021 17:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91=20https://www.tapd.cn/39598945/prong/stories?=
 =?UTF-8?q?/view/1139598945001000225?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/manager/controller/UserFollow.php |  1 +
 app/order/controller/CashOutAdmin.php | 18 +++++++++++++++++-
 app/user/controller/User.php          |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/manager/controller/UserFollow.php b/app/manager/controller/UserFollow.php
index 56dfa33..29f9e74 100644
--- a/app/manager/controller/UserFollow.php
+++ b/app/manager/controller/UserFollow.php
@@ -74,6 +74,7 @@ class UserFollow extends Controller
             }
             if (!empty($search['keyWord'])) {
                 $where['LoginCode'] = ['like', '%' . $search['keyWord'] . '%'];
+                unset($where['ManagerId']);
             }
             $flag = date("d", time()) == date("t", time());
             $date1 = date("Y-m-01", strtotime("-1 month"));
diff --git a/app/order/controller/CashOutAdmin.php b/app/order/controller/CashOutAdmin.php
index 560f86b..9f233ee 100644
--- a/app/order/controller/CashOutAdmin.php
+++ b/app/order/controller/CashOutAdmin.php
@@ -10,6 +10,7 @@
 
 namespace app\order\controller;
 
+use app\manager\model\Manager;
 use alipay\Alipay;
 use app\order\model\CashOut as CashMoedl;
 use app\order\model\User as UserModel;
@@ -24,7 +25,15 @@ class CashOutAdmin extends Controller
     public function getData()
     {
         $cash = new CashMoedl;
-        $list = $cash->getListPage();
+        $manager_model = new Manager;
+
+        $manager = $manager_model->getOne(['id'=>$this->userinfo['OperaterID']]);
+        $where = [];
+        if($manager['IsRoot'] != 1){
+            $where['status'] = 0;
+        }
+
+        $list = $cash->getListPage($where);
         //提现状态
         $status = ['待处理', '同意', '拒绝'];
         foreach ($list as &$v) {
@@ -51,6 +60,13 @@ class CashOutAdmin extends Controller
         $where = [];
         $page = ($_GET['page'] - 1) * 50;
         $cash = new CashMoedl;
+        $manager_model = new Manager;
+
+        $manager = $manager_model->getOne(['id'=>$this->userinfo['OperaterID']]);
+        $where = [];
+        if($manager['IsRoot'] != 1){
+            $where['status'] = 0;
+        }
         $list = $cash->getListPage($where, '*', 'id desc', "$page,50");
         //提现状态
         $status = ['待处理', '同意', '拒绝'];
diff --git a/app/user/controller/User.php b/app/user/controller/User.php
index c70d418..74d6fda 100644
--- a/app/user/controller/User.php
+++ b/app/user/controller/User.php
@@ -21,7 +21,7 @@ class User extends Controller
         $where = '';
         if(!empty($_GET['keyWord'])){
 
-            $where = "LoginCode like '%".$_GET['keyWord']."%' or Phone like '%".$_GET['keyWord']."%' or TaoBao like '%".$_GET['keyWord']."%'";
+            $where = "LoginCode like '%".$_GET['keyWord']."%' or Phone like '%".$_GET['keyWord']."%' or TaoBao like '%".$_GET['keyWord']."%' or Wx like '%".$_GET['keyWord']."%' or QQ like '%".$_GET['keyWord']."%'";
         }
 
         if(!empty($_GET['schemeId'])){