yaooo
/
lihai-oa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新细节

This commit is contained in:
yaooo 2023-11-20 15:22:41 +08:00
parent b854deeaf1
commit 365c570717
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/controller/Common.php
View File

@ -352,7 +352,7 @@ class Common extends ApiController
else if($next_step['flow_type'] == 2){ else if($next_step['flow_type'] == 2){
$param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); $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']); $param['check_admin_ids'] = get_department_leader($detail['admin_id']);
} }
else if($next_step['flow_type'] == 6){ else if($next_step['flow_type'] == 6){
@ -370,6 +370,7 @@ class Common extends ApiController
$param['check_admin_ids'] =''; $param['check_admin_ids'] ='';
} }
} }
halt($next_step, $param['check_status'], $param['check_admin_ids']);
if($param['check_status'] == 1 && empty($param['check_admin_ids'])){ if($param['check_status'] == 1 && empty($param['check_admin_ids'])){
$this->apiError("找不到下一步的审批人，该审批流程设置有问题，请联系HR或者管理员"); $this->apiError("找不到下一步的审批人，该审批流程设置有问题，请联系HR或者管理员");
} }

4
app/api/controller/FinanceExpense.php
View File

@ -201,7 +201,7 @@ class FinanceExpense extends ApiController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $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); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -311,7 +311,7 @@ class FinanceExpense extends ApiController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $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); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;

1
app/api/controller/Index.php
View File

@ -477,6 +477,7 @@ class Index extends BaseController
$param['check_admin_ids'] =''; $param['check_admin_ids'] ='';
} }
} }
halt($next_step, $param['check_status'], $param['check_admin_ids']);
if($param['check_status'] == 1 && empty($param['check_admin_ids'])){ if($param['check_status'] == 1 && empty($param['check_admin_ids'])){
return to_assign(1,'找不到下一步的审批人，该审批流程设置有问题，请联系HR或者管理员'); return to_assign(1,'找不到下一步的审批人，该审批流程设置有问题，请联系HR或者管理员');
} }

4
app/common.php
View File

@ -377,7 +377,7 @@ function set_flow($flow_id,$check_admin_ids,$uid)
$check_admin_ids = $manager; $check_admin_ids = $manager;
} }
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
//部门分管领导 //部门分管领导
$leader = get_department_leader($uid); $leader = get_department_leader($uid);
if($leader == 0){ if($leader == 0){
@ -430,7 +430,7 @@ function get_flow($uid,$flows)
$check_user = '上级部门负责人-'; $check_user = '上级部门负责人-';
$check_user_ids[]=get_department_manager($uid,1); $check_user_ids[]=get_department_manager($uid,1);
} }
else if($flows['flow_type']==5){ else if($flows['flow_type']==7){
$check_user = '部门分管领导-'; $check_user = '部门分管领导-';
$check_user_ids[]=get_department_leader($uid); $check_user_ids[]=get_department_leader($uid);
} }

6
app/oa/controller/Approve.php
View File

@ -304,7 +304,7 @@ class Approve extends BaseController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $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); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -493,11 +493,11 @@ class Approve extends BaseController
$detail['check_user'] = '上级部门负责人'; $detail['check_user'] = '上级部门负责人';
$check_user_ids = explode(',',$detail['check_admin_ids']); $check_user_ids = explode(',',$detail['check_admin_ids']);
} }
else if($flows['flow_type']==5){ else if($flows['flow_type']==7){
$detail['check_user'] = '部门分管领导'; $detail['check_user'] = '部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']); $check_user_ids = explode(',',$detail['check_admin_ids']);
} }
else if($flows['flow_type']==7){ else if($flows['flow_type']==6){
$detail['check_user'] = '上级部门分管领导'; $detail['check_user'] = '上级部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']); $check_user_ids = explode(',',$detail['check_admin_ids']);
} }