diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 9bd44ce4a..f4c4f29c9 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -20,7 +20,7 @@ class MarketPercentageController extends ThinkController
$_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):'';
$_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):'';
$_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
- $_REQUEST['company_id']?($map['company_id'] = $_REQUEST['company_id']):'';
+ ($_REQUEST['company_id']||$_REQUEST['company_id']=='0')?($map['company_id'] = $_REQUEST['company_id']):'';
$admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
$map['admin_id'] = $admin_id;
@@ -141,6 +141,7 @@ class MarketPercentageController extends ThinkController
if ($_REQUEST['export']) {
$title = ['pay_time' => '时间',
+ 'company_name'=>'推广公司',
'promote_account' => '会长账号',
'company_belong' => '内外团',
'real_name' => '所属市场专员',
@@ -365,11 +366,13 @@ class MarketPercentageController extends ThinkController
}
if(!$value['market_check']) {
- $data[$key]['market_check_detail'] = "市场部未确认({$admin})
".date("Y-m-d H:m:s",time());
+ $data[$key]['market_check_detail'] = "-----";
+//({$admin})
".date("Y-m-d H:m:s",time());
}
if (!$value['finance_check']) {
- $data[$key]['finance_check_detail'] = "财务部未审批({$admin})
".date("Y-m-d H:m:s",time());
+ $data[$key]['finance_check_detail'] = "-----";
+//({$admin})
".date("Y-m-d H:m:s",time());
}
if ($_REQUEST['export']) {
diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html
index e6cb65efe..a767eba31 100644
--- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html
+++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html
@@ -182,8 +182,8 @@