diff --git a/app/api/controller/Common.php b/app/api/controller/Common.php index 3a090e2..2e281a6 100644 --- a/app/api/controller/Common.php +++ b/app/api/controller/Common.php @@ -295,9 +295,15 @@ class Common extends ApiController if($next_step){ //存在下一步审核 if($next_step['flow_type'] == 1){ - $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + $param['check_admin_ids'] = get_department_manager($detail['admin_id']); } else if($next_step['flow_type'] == 2){ + $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); + } + else if($next_step['flow_type'] == 5){ + $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + } + else if($next_step['flow_type'] == 6){ $param['check_admin_ids'] = get_department_leader($detail['admin_id'],1); } else{ @@ -345,9 +351,15 @@ class Common extends ApiController if($next_step){ //存在下一步审核 if($next_step['flow_type'] == 1){ - $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + $param['check_admin_ids'] = get_department_manager($detail['admin_id']); } else if($next_step['flow_type'] == 2){ + $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); + } + else if($next_step['flow_type'] == 5){ + $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + } + else if($next_step['flow_type'] == 6){ $param['check_admin_ids'] = get_department_leader($detail['admin_id'],1); } else{ diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php index cec1ba3..6292e9d 100644 --- a/app/api/controller/Index.php +++ b/app/api/controller/Index.php @@ -398,9 +398,15 @@ class Index extends BaseController if($next_step){ //存在下一步审核 if($next_step['flow_type'] == 1){ - $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + $param['check_admin_ids'] = get_department_manager($detail['admin_id']); } else if($next_step['flow_type'] == 2){ + $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); + } + else if($next_step['flow_type'] == 5){ + $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + } + else if($next_step['flow_type'] == 6){ $param['check_admin_ids'] = get_department_leader($detail['admin_id'],1); } else{ @@ -448,9 +454,15 @@ class Index extends BaseController if($next_step){ //存在下一步审核 if($next_step['flow_type'] == 1){ - $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + $param['check_admin_ids'] = get_department_manager($detail['admin_id']); } else if($next_step['flow_type'] == 2){ + $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); + } + else if($next_step['flow_type'] == 5){ + $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + } + else if($next_step['flow_type'] == 6){ $param['check_admin_ids'] = get_department_leader($detail['admin_id'],1); } else{ diff --git a/app/api/controller/OaApprove.php b/app/api/controller/OaApprove.php index ae45e6d..0702d63 100644 --- a/app/api/controller/OaApprove.php +++ b/app/api/controller/OaApprove.php @@ -400,9 +400,15 @@ class OaApprove extends ApiController if($next_step){ //存在下一步审核 if($next_step['flow_type'] == 1){ - $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + $param['check_admin_ids'] = get_department_manager($detail['admin_id']); } else if($next_step['flow_type'] == 2){ + $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); + } + else if($next_step['flow_type'] == 5){ + $param['check_admin_ids'] = get_department_leader($detail['admin_id']); + } + else if($next_step['flow_type'] == 6){ $param['check_admin_ids'] = get_department_leader($detail['admin_id'],1); } else{ diff --git a/app/finance/controller/Expense.php b/app/finance/controller/Expense.php index 4b9aecb..3447774 100644 --- a/app/finance/controller/Expense.php +++ b/app/finance/controller/Expense.php @@ -445,10 +445,18 @@ class Expense extends BaseController if($detail['check_status']==1){ if($flows['flow_type']==1){ $detail['check_user'] = '部门负责人'; - $check_user_ids[]=get_department_leader($detail['admin_id']); + $check_user_ids[]=get_department_manager($detail['admin_id']); } else if($flows['flow_type']==2){ $detail['check_user'] = '上级部门负责人'; + $check_user_ids[]=get_department_manager($detail['admin_id'],1); + } + else if($flows['flow_type']==5){ + $detail['check_user'] = '部门分管领导'; + $check_user_ids[]=get_department_leader($detail['admin_id']); + } + else if($flows['flow_type']==6){ + $detail['check_user'] = '上级部门分管领导'; $check_user_ids[]=get_department_leader($detail['admin_id'],1); } else{ diff --git a/app/finance/controller/Invoice.php b/app/finance/controller/Invoice.php index d114070..767ad8b 100644 --- a/app/finance/controller/Invoice.php +++ b/app/finance/controller/Invoice.php @@ -387,10 +387,18 @@ class Invoice extends BaseController if($detail['check_status'] == 1){ if($flows['flow_type']==1){ $detail['check_user'] = '部门负责人'; - $check_user_ids[]=get_department_leader($detail['admin_id']); + $check_user_ids[]=get_department_manager($detail['admin_id']); } else if($flows['flow_type']==2){ $detail['check_user'] = '上级部门负责人'; + $check_user_ids[]=get_department_manager($detail['admin_id'],1); + } + else if($flows['flow_type']==5){ + $detail['check_user'] = '部门分管领导'; + $check_user_ids[]=get_department_leader($detail['admin_id']); + } + else if($flows['flow_type']==6){ + $detail['check_user'] = '上级部门分管领导'; $check_user_ids[]=get_department_leader($detail['admin_id'],1); } else{