Merge branch 'feature/add_item' of wmtx/platform into release

小bug修改

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' => '维护总流水',

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;