diff --git a/app/api/controller/FinanceExpense.php b/app/api/controller/FinanceExpense.php index 9509d82..0db3b03 100644 --- a/app/api/controller/FinanceExpense.php +++ b/app/api/controller/FinanceExpense.php @@ -427,10 +427,18 @@ class FinanceExpense extends ApiController 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/api/controller/FinanceInvoice.php b/app/api/controller/FinanceInvoice.php index 3a3812a..f7513a4 100644 --- a/app/api/controller/FinanceInvoice.php +++ b/app/api/controller/FinanceInvoice.php @@ -386,10 +386,18 @@ class FinanceInvoice extends ApiController 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/api/controller/OaApprove.php b/app/api/controller/OaApprove.php index 0702d63..666425a 100644 --- a/app/api/controller/OaApprove.php +++ b/app/api/controller/OaApprove.php @@ -456,9 +456,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{