Merge pull request 'feature/finance_payment_20210115' (#190) from feature/finance_payment_20210115 into release

优化连接
master
陈志 4 years ago
commit f328397807

@ -120,9 +120,7 @@ return array(
"sub_user_statement", "sub_user_statement",
"tab_index_chart", "tab_index_chart",
"tab_company_statement", "tab_company_statement",
"tab_company_statement_pool",
"tab_financial_summary", "tab_financial_summary",
"tab_pay_statement_info",
"tab_settleup_marketorder", "tab_settleup_marketorder",
"tab_market_altogether", "tab_market_altogether",
"tab_cmd_tasks", "tab_cmd_tasks",

@ -221,7 +221,9 @@ class AuthManagerController extends AdminController{
$data = $AuthGroup->create(); $data = $AuthGroup->create();
if ( $data ) { if ( $data ) {
if ( empty($data['id']) ) { 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); $r = $AuthGroup->syncAdd($data);
addOperationLog(array( addOperationLog(array(
"op_type"=>0, "op_type"=>0,
@ -229,7 +231,9 @@ class AuthManagerController extends AdminController{
"url"=>U("AuthManager/index") "url"=>U("AuthManager/index")
)); ));
}else{ }else{
\Think\Log::actionLog('AuthManager/editGroup','authGroup',1); if(!IS_SUBSITE){
\Think\Log::actionLog('AuthManager/editGroup','authGroup',1);
}
if($isrules){ if($isrules){
$r = SM("auth_group","sys_")->save($data); $r = SM("auth_group","sys_")->save($data);
}else{ }else{

@ -2161,7 +2161,7 @@ class CompanyStatementPoolController extends ThinkController
if ($info['withdraw_type'] == "特殊补点") { if ($info['withdraw_type'] == "特殊补点") {
$optist = array_diff($optist, ["cancelPool"]); $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"); array_push($optist,"cancelPool");
} }
} }

Loading…
Cancel
Save