From 0ebaf6ed64abd5d9715d57917113c2392c1f4e5f Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 28 Sep 2020 11:39:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php   | 4 ++--
 .../Admin/Controller/PresidentDepositController.class.php   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index f4c4f29c9..e68cc9961 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -141,7 +141,7 @@ class MarketPercentageController extends ThinkController
         if ($_REQUEST['export']) {
 
             $title = ['pay_time' => '时间',
-                'company_name'=>'推广公司',
+                'company_name'=>'公司名称',
                 'promote_account' => '会长账号',
                 'company_belong' => '内外团',
                 'real_name' => '所属市场专员',
@@ -524,7 +524,7 @@ class MarketPercentageController extends ThinkController
         if ($_REQUEST['export']) {
 
             $title = ['pay_time' => '时间',
-                'real_name' => '市场人员',
+                'real_name' => '市场专员',
                 'level' => '级别',
                 'performance_revenue' => '开发总流水',
                 'appraisal_bonuses' => '维护总流水',
diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index d797c5288..9720c4ed5 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -81,11 +81,13 @@ class PresidentDepositController extends ThinkController
         $subSql = M('president_deposit', 'tab_')->field('company_id')->where($depositWhere)->select(false);
         $where['_string'] .= ' and id in (' . $subSql . ')';
 
+        $query = M('promote_company', 'tab_');
+
         if (!empty(I('admin_id', 0))) {
-            $query->where(['admin_id' => I('admin_id', 0)]);
+            $query->where(['uid' => I('admin_id', 0)]);
         }
 
-        $query = M('promote_company', 'tab_')->where($where);
+        $query = $query->where($where);
 
         $count = 0;
         $totalQuery = clone $query;