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

更新审核机制

This commit is contained in:
yaooo 2023-11-18 14:33:30 +08:00
parent 5bf3d2ca1e
commit c8fb615970
6 changed files with 136 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,22 +184,6 @@ class FinanceExpense extends ApiController
} }
} }
} }
/*
if($flow[0]['flow_type'] == 1){
//部门负责人
$leader = get_department_leader($admin_id);
if($leader == 0){
$this->apiError('审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
}
else if($flow[0]['flow_type'] == 2){
//上级部门负责人
$leader = get_department_leader($admin_id,1);
if($leader == 0){
$this->apiError('审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
}
}
*/
} }
$dbRes = false; $dbRes = false;

66
app/api/controller/FinanceInvoice.php
View File

@ -173,41 +173,43 @@ class FinanceInvoice extends ApiController
$this->apiError("银行地址不能为空"); $this->apiError("银行地址不能为空");
} }
} }
foreach($flow as $item) { if (!isset($param['check_admin_ids'])) {
// 当前部门负责人 foreach($flow as $item) {
if ($item['flow_type'] == 1) { // 当前部门负责人
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id'); if ($item['flow_type'] == 1) {
if (empty($manager_id)) { $manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
$this->apiError('当前部门负责人不存在'); if (empty($manager_id)) {
$this->apiError('当前部门负责人不存在');
}
} }
} // 上一级部门负责人
// 上一级部门负责人 if ($item['flow_type'] == 2) {
if ($item['flow_type'] == 2) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$pid = Db::name('department')->where('id', $this->did)->value('pid'); if (empty($pid)) {
if (empty($pid)) { $this->apiError('上一级部门不存在');
$this->apiError('上一级部门不存在'); }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
$this->apiError('上一级部门负责人不存在');
}
} }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id'); // 当前部门分管领导
if (empty($manager_id)) { if ($item['flow_type'] == 5) {
$this->apiError('上一级部门负责人不存在'); $leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
$this->apiError('当前部门分管领导不存在');
}
} }
} // 上一级部门分管领导
// 当前部门分管领导 if ($item['flow_type'] == 6) {
if ($item['flow_type'] == 5) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id'); if (empty($pid)) {
if (empty($leader_id)) { $this->apiError('上一级部门不存在');
$this->apiError('当前部门分管领导不存在'); }
} $leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
} if (empty($leader_id)) {
// 上一级部门分管领导 $this->apiError('当前部门分管领导不存在');
if ($item['flow_type'] == 6) { }
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
$this->apiError('上一级部门不存在');
}
$leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
if (empty($leader_id)) {
$this->apiError('当前部门分管领导不存在');
} }
} }
} }

66
app/api/controller/OaApprove.php
View File

@ -147,41 +147,43 @@ class OaApprove extends ApiController
} }
$flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list'); $flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list');
$flow = unserialize($flow_list); $flow = unserialize($flow_list);
foreach($flow as $item) { if (!isset($param['check_admin_ids'])) {
// 当前部门负责人 foreach($flow as $item) {
if ($item['flow_type'] == 1) { // 当前部门负责人
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id'); if ($item['flow_type'] == 1) {
if (empty($manager_id)) { $manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
$this->apiError('当前部门负责人不存在'); if (empty($manager_id)) {
$this->apiError('当前部门负责人不存在');
}
} }
} // 上一级部门负责人
// 上一级部门负责人 if ($item['flow_type'] == 2) {
if ($item['flow_type'] == 2) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$pid = Db::name('department')->where('id', $this->did)->value('pid'); if (empty($pid)) {
if (empty($pid)) { $this->apiError('上一级部门不存在');
$this->apiError('上一级部门不存在'); }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
$this->apiError('上一级部门负责人不存在');
}
} }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id'); // 当前部门分管领导
if (empty($manager_id)) { if ($item['flow_type'] == 5) {
$this->apiError('上一级部门负责人不存在'); $leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
$this->apiError('当前部门分管领导不存在');
}
} }
} // 上一级部门分管领导
// 当前部门分管领导 if ($item['flow_type'] == 6) {
if ($item['flow_type'] == 5) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id'); if (empty($pid)) {
if (empty($leader_id)) { $this->apiError('上一级部门不存在');
$this->apiError('当前部门分管领导不存在'); }
} $leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
} if (empty($leader_id)) {
// 上一级部门分管领导 $this->apiError('当前部门分管领导不存在');
if ($item['flow_type'] == 6) { }
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
$this->apiError('上一级部门不存在');
}
$leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
if (empty($leader_id)) {
$this->apiError('当前部门分管领导不存在');
} }
} }
} }

17
app/finance/controller/Expense.php
View File

@ -152,7 +152,6 @@ class Expense extends BaseController
$flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list'); $flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list');
$flow = unserialize($flow_list); $flow = unserialize($flow_list);
halt($flow);
if (!isset($param['check_admin_ids'])) { if (!isset($param['check_admin_ids'])) {
foreach($flow as $item) { foreach($flow as $item) {
// 当前部门负责人 // 当前部门负责人
@ -192,22 +191,6 @@ class Expense extends BaseController
} }
} }
} }
/*
if($flow[0]['flow_type'] == 1){
//部门负责人
$leader = get_department_leader($admin_id);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
}
else if($flow[0]['flow_type'] == 2){
//上级部门负责人
$leader = get_department_leader($admin_id,1);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
}
}
*/
} }
$dbRes = false; $dbRes = false;

66
app/finance/controller/Invoice.php
View File

@ -152,41 +152,43 @@ class Invoice extends BaseController
return to_assign(1, '银行地址不能为空'); return to_assign(1, '银行地址不能为空');
} }
} }
foreach($flow as $item) { if (!isset($param['check_admin_ids'])) {
// 当前部门负责人 foreach($flow as $item) {
if ($item['flow_type'] == 1) { // 当前部门负责人
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id'); if ($item['flow_type'] == 1) {
if (empty($manager_id)) { $manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
return to_assign(1,'当前部门负责人不存在'); if (empty($manager_id)) {
return to_assign(1,'当前部门负责人不存在');
}
} }
} // 上一级部门负责人
// 上一级部门负责人 if ($item['flow_type'] == 2) {
if ($item['flow_type'] == 2) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$pid = Db::name('department')->where('id', $this->did)->value('pid'); if (empty($pid)) {
if (empty($pid)) { return to_assign(1,'上一级部门不存在');
return to_assign(1,'上一级部门不存在'); }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
return to_assign(1,'上一级部门负责人不存在');
}
} }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id'); // 当前部门分管领导
if (empty($manager_id)) { if ($item['flow_type'] == 5) {
return to_assign(1,'上一级部门负责人不存在'); $leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
return to_assign(1,'当前部门分管领导不存在');
}
} }
} // 上一级部门分管领导
// 当前部门分管领导 if ($item['flow_type'] == 6) {
if ($item['flow_type'] == 5) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id'); if (empty($pid)) {
if (empty($leader_id)) { return to_assign(1,'上一级部门不存在');
return to_assign(1,'当前部门分管领导不存在'); }
} $leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
} if (empty($leader_id)) {
// 上一级部门分管领导 return to_assign(1,'当前部门分管领导不存在');
if ($item['flow_type'] == 6) { }
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
return to_assign(1,'上一级部门不存在');
}
$leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
if (empty($leader_id)) {
return to_assign(1,'当前部门分管领导不存在');
} }
} }
} }

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

@ -253,42 +253,43 @@ class Approve extends BaseController
} }
$flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list'); $flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list');
$flow = unserialize($flow_list); $flow = unserialize($flow_list);
if (!isset($param['check_admin_ids'])) {
foreach($flow as $item) { foreach($flow as $item) {
// 当前部门负责人 // 当前部门负责人
if ($item['flow_type'] == 1) { if ($item['flow_type'] == 1) {
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id'); $manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
if (empty($manager_id)) { if (empty($manager_id)) {
return to_assign(1,'当前部门负责人不存在'); return to_assign(1,'当前部门负责人不存在');
}
} }
} // 上一级部门负责人
// 上一级部门负责人 if ($item['flow_type'] == 2) {
if ($item['flow_type'] == 2) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$pid = Db::name('department')->where('id', $this->did)->value('pid'); if (empty($pid)) {
if (empty($pid)) { return to_assign(1,'上一级部门不存在');
return to_assign(1,'上一级部门不存在'); }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
return to_assign(1,'上一级部门负责人不存在');
}
} }
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id'); // 当前部门分管领导
if (empty($manager_id)) { if ($item['flow_type'] == 5) {
return to_assign(1,'上一级部门负责人不存在'); $leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
return to_assign(1,'当前部门分管领导不存在');
}
} }
} // 上一级部门分管领导
// 当前部门分管领导 if ($item['flow_type'] == 6) {
if ($item['flow_type'] == 5) { $pid = Db::name('department')->where('id', $this->did)->value('pid');
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id'); if (empty($pid)) {
if (empty($leader_id)) { return to_assign(1,'上一级部门不存在');
return to_assign(1,'当前部门分管领导不存在'); }
} $leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
} if (empty($leader_id)) {
// 上一级部门分管领导 return to_assign(1,'当前部门分管领导不存在');
if ($item['flow_type'] == 6) { }
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
return to_assign(1,'上一级部门不存在');
}
$leader_id = Db::name('department')->where('id', $pid)->value('leader_id');
if (empty($leader_id)) {
return to_assign(1,'当前部门分管领导不存在');
} }
} }
} }