diff --git a/app/api/controller/Common.php b/app/api/controller/Common.php index a872a6e..eab8362 100644 --- a/app/api/controller/Common.php +++ b/app/api/controller/Common.php @@ -352,7 +352,7 @@ class Common extends ApiController 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){ + else if($next_step['flow_type'] == 7){ $param['check_admin_ids'] = get_department_leader($detail['admin_id']); } else if($next_step['flow_type'] == 6){ @@ -370,6 +370,7 @@ class Common extends ApiController $param['check_admin_ids'] =''; } } + halt($next_step, $param['check_status'], $param['check_admin_ids']); if($param['check_status'] == 1 && empty($param['check_admin_ids'])){ $this->apiError("找不到下一步的审批人,该审批流程设置有问题,请联系HR或者管理员"); } diff --git a/app/api/controller/FinanceExpense.php b/app/api/controller/FinanceExpense.php index 862ca80..60e938d 100644 --- a/app/api/controller/FinanceExpense.php +++ b/app/api/controller/FinanceExpense.php @@ -201,7 +201,7 @@ class FinanceExpense extends ApiController $manager = get_department_manager($this->uid, 1); $param['check_admin_ids'] = $manager; } - else if($flow[0]['flow_type'] == 5){ + else if($flow[0]['flow_type'] == 7){ // 部门分管领导 $leader = get_department_leader($this->uid); $param['check_admin_ids'] = $leader; @@ -311,7 +311,7 @@ class FinanceExpense extends ApiController $manager = get_department_manager($this->uid, 1); $param['check_admin_ids'] = $manager; } - else if($flow[0]['flow_type'] == 5){ + else if($flow[0]['flow_type'] == 7){ // 部门分管领导 $leader = get_department_leader($this->uid); $param['check_admin_ids'] = $leader; diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php index 01637ee..62b2cb6 100644 --- a/app/api/controller/Index.php +++ b/app/api/controller/Index.php @@ -477,6 +477,7 @@ class Index extends BaseController $param['check_admin_ids'] =''; } } + halt($next_step, $param['check_status'], $param['check_admin_ids']); if($param['check_status'] == 1 && empty($param['check_admin_ids'])){ return to_assign(1,'找不到下一步的审批人,该审批流程设置有问题,请联系HR或者管理员'); } diff --git a/app/common.php b/app/common.php index 4c98682..89c40d1 100644 --- a/app/common.php +++ b/app/common.php @@ -377,7 +377,7 @@ function set_flow($flow_id,$check_admin_ids,$uid) $check_admin_ids = $manager; } } - else if($flow[0]['flow_type'] == 5){ + else if($flow[0]['flow_type'] == 7){ //部门分管领导 $leader = get_department_leader($uid); if($leader == 0){ @@ -430,7 +430,7 @@ function get_flow($uid,$flows) $check_user = '上级部门负责人-'; $check_user_ids[]=get_department_manager($uid,1); } - else if($flows['flow_type']==5){ + else if($flows['flow_type']==7){ $check_user = '部门分管领导-'; $check_user_ids[]=get_department_leader($uid); } diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php index 343661e..76fcb5f 100644 --- a/app/oa/controller/Approve.php +++ b/app/oa/controller/Approve.php @@ -304,7 +304,7 @@ class Approve extends BaseController $manager = get_department_manager($this->uid, 1); $param['check_admin_ids'] = $manager; } - else if($flow[0]['flow_type'] == 5){ + else if($flow[0]['flow_type'] == 7){ // 部门分管领导 $leader = get_department_leader($this->uid); $param['check_admin_ids'] = $leader; @@ -493,11 +493,11 @@ class Approve extends BaseController $detail['check_user'] = '上级部门负责人'; $check_user_ids = explode(',',$detail['check_admin_ids']); } - else if($flows['flow_type']==5){ + else if($flows['flow_type']==7){ $detail['check_user'] = '部门分管领导'; $check_user_ids = explode(',',$detail['check_admin_ids']); } - else if($flows['flow_type']==7){ + else if($flows['flow_type']==6){ $detail['check_user'] = '上级部门分管领导'; $check_user_ids = explode(',',$detail['check_admin_ids']); }