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

汇总权限测试
master
郑永星 4 years ago committed by Gogs
commit 2c8c246d31

@ -728,7 +728,7 @@ class AggregateRelationController extends AdminController
if(IS_ROOT){
$resarr[] = $opBtn[$v];
}else{
if(in_array($v,$this->OpAuthList)){
if(in_array('Admin/aggregateRelation/'.$v,$this->OpAuthList)){
$resarr[] = $opBtn[$v];
}
}
@ -750,7 +750,7 @@ class AggregateRelationController extends AdminController
if(IS_ROOT){
$resarr[] = $v;
}else{
if(in_array($k,$this->OpAuthList)){
if(in_array('Admin/aggregateRelation/'.$k,$this->OpAuthList)){
$resarr[] = $v;
}
}

@ -33,6 +33,7 @@ class AggregateStatementLackController extends ThinkController
if(!IS_ROOT){
$this->OpAuthList= getModuleControllerAuth();
}
// dump($this->OpAuthList);die();
$this->assign('menubtn',$this->menuAuth());
$map = [
@ -350,7 +351,7 @@ class AggregateStatementLackController extends ThinkController
if(IS_ROOT){
$resarr[] = $opBtn[$v];
}else{
if(in_array($v,$this->OpAuthList)){
if(in_array("Admin/aggregateStatementLack/".$v,$this->OpAuthList)){
$resarr[] = $opBtn[$v];
}
}
@ -368,7 +369,7 @@ class AggregateStatementLackController extends ThinkController
if(IS_ROOT){
$resarr[] = $v;
}else{
if(in_array($k,$this->OpAuthList)){
if(in_array("Admin/aggregateStatementLack/".$k,$this->OpAuthList)){
$resarr[] = $v;
}
}

@ -921,6 +921,7 @@ class AggregateStatementPoolController extends ThinkController
default:
break;
}
$optist = ["viewPool","cancelPool"];
//
if($info['platform_amount'] <= 0 && $info['company_type'] != 2){
@ -942,7 +943,7 @@ class AggregateStatementPoolController extends ThinkController
}else{
$optist = array_diff($optist, ["cancelPool","reCount"]);
}
if(empty($info['ext_file'])){
//未上传凭证
$optist = array_diff($optist, ["viewVoucher", "editVoucher"]);
@ -969,7 +970,7 @@ class AggregateStatementPoolController extends ThinkController
if(IS_ROOT){
$resarr[] = $opBtn[$v];
}else{
if(in_array($v,$this->OpAuthList)){
if(in_array("Admin/aggregateStatementPool/".$v,$this->OpAuthList)){
$resarr[] = $opBtn[$v];
}
}
@ -988,7 +989,7 @@ class AggregateStatementPoolController extends ThinkController
if(IS_ROOT){
$resarr[] = $v;
}else{
if(in_array($k,$this->OpAuthList)){
if(in_array("Admin/aggregateStatementPool/".$k,$this->OpAuthList)){
$resarr[] = $v;
}
}

Loading…
Cancel
Save