diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 3394d0686..26d141df6 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -120,9 +120,7 @@ return array( "sub_user_statement", "tab_index_chart", "tab_company_statement", - "tab_company_statement_pool", "tab_financial_summary", - "tab_pay_statement_info", "tab_settleup_marketorder", "tab_market_altogether", "tab_cmd_tasks", diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php index 9f3c009a1..655740236 100644 --- a/Application/Admin/Controller/AuthManagerController.class.php +++ b/Application/Admin/Controller/AuthManagerController.class.php @@ -221,7 +221,9 @@ class AuthManagerController extends AdminController{ $data = $AuthGroup->create(); if ( $data ) { if ( empty($data['id']) ) { - \Think\Log::actionLog('AuthManager/createGroup','authGroup',1); + if(!IS_SUBSITE){ + \Think\Log::actionLog('AuthManager/createGroup','authGroup',1); + } $r = $AuthGroup->syncAdd($data); addOperationLog(array( "op_type"=>0, @@ -229,7 +231,9 @@ class AuthManagerController extends AdminController{ "url"=>U("AuthManager/index") )); }else{ - \Think\Log::actionLog('AuthManager/editGroup','authGroup',1); + if(!IS_SUBSITE){ + \Think\Log::actionLog('AuthManager/editGroup','authGroup',1); + } if($isrules){ $r = SM("auth_group","sys_")->save($data); }else{ diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index a2974226e..a444357d9 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -2161,7 +2161,7 @@ class CompanyStatementPoolController extends ThinkController if ($info['withdraw_type'] == "特殊补点") { $optist = array_diff($optist, ["cancelPool"]); - if ($info['verify_status'] == '0') { + if ($info['verify_status'] == '0' || $info['verify_status'] == '6'|| $info['verify_status'] == '-3') { array_push($optist,"cancelPool"); } }