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 15:39:25 +08:00
parent f22d45a4cd
commit 04555d198c
5 changed files with 176 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,43 +149,34 @@ class FinanceExpense extends ApiController
foreach($flow as $item) {
// 当前部门负责人
if ($item['flow_type'] == 1) {
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
if (empty($manager_id)) {
$manager = get_department_manager($this->uid);
if (empty($manager)) {
$this->apiError('当前部门负责人不存在');
}
}
// 上一级部门负责人
// 上级部门负责人
if ($item['flow_type'] == 2) {
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
$this->apiError('上一级部门不存在');
}
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
$this->apiError('上一级部门负责人不存在');
$manager = get_department_manager($this->uid, 1);
if (empty($manager)) {
$this->apiError('上级部门负责人不存在');
}
}
// 当前部门分管领导
if ($item['flow_type'] == 5) {
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
$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('上一级部门分管领导不存在');
$leader = get_department_leader($this->uid, 1);
if (empty($leader)) {
$this->apiError('上级部门分管领导不存在');
}
}
}
}
$dbRes = false;
if (!empty($param['id']) && $param['id'] > 0) {
try {
@ -202,23 +193,23 @@ class FinanceExpense extends ApiController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
$this->apiError('审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
$this->apiError('审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];
@ -312,23 +303,23 @@ class FinanceExpense extends ApiController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];

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

@ -177,38 +177,30 @@ class FinanceInvoice extends ApiController
foreach($flow as $item) {
// 当前部门负责人
if ($item['flow_type'] == 1) {
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
if (empty($manager_id)) {
$manager = get_department_manager($this->uid);
if (empty($manager)) {
$this->apiError('当前部门负责人不存在');
}
}
// 上一级部门负责人
// 上级部门负责人
if ($item['flow_type'] == 2) {
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
$this->apiError('上一级部门不存在');
}
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
$this->apiError('上一级部门负责人不存在');
$manager = get_department_manager($this->uid, 1);
if (empty($manager)) {
$this->apiError('上级部门负责人不存在');
}
}
// 当前部门分管领导
if ($item['flow_type'] == 5) {
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
$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('上一级部门分管领导不存在');
$leader = get_department_leader($this->uid, 1);
if (empty($leader)) {
$this->apiError('上级部门分管领导不存在');
}
}
}
@ -227,23 +219,23 @@ class FinanceInvoice extends ApiController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
$this->apiError("审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员");
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
$this->apiError('审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];
@ -306,23 +298,23 @@ class FinanceInvoice extends ApiController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
$this->apiError('审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
$this->apiError('审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];

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

@ -147,7 +147,6 @@ class OaApprove extends ApiController
}
$flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list');
$flow = unserialize($flow_list);
if (!isset($param['check_admin_ids'])) {
foreach($flow as $item) {
// 当前部门负责人

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

@ -156,43 +156,34 @@ class Expense extends BaseController
foreach($flow as $item) {
// 当前部门负责人
if ($item['flow_type'] == 1) {
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
if (empty($manager_id)) {
$manager = get_department_manager($this->uid);
if (empty($manager)) {
return to_assign(1,'当前部门负责人不存在');
}
}
// 上一级部门负责人
// 上级部门负责人
if ($item['flow_type'] == 2) {
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
return to_assign(1,'上一级部门不存在');
}
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
return to_assign(1,'上一级部门负责人不存在');
$manager = get_department_manager($this->uid, 1);
if (empty($manager)) {
return to_assign(1,'上级部门负责人不存在');
}
}
// 当前部门分管领导
if ($item['flow_type'] == 5) {
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
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,'上一级部门分管领导不存在');
$leader = get_department_leader($this->uid, 1);
if (empty($leader)) {
return to_assign(1,'上级部门分管领导不存在');
}
}
}
}
$dbRes = false;
if (!empty($param['id']) && $param['id'] > 0) {
try {
@ -210,23 +201,23 @@ class Expense extends BaseController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];
@ -320,23 +311,23 @@ class Expense extends BaseController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];

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

@ -156,38 +156,30 @@ class Invoice extends BaseController
foreach($flow as $item) {
// 当前部门负责人
if ($item['flow_type'] == 1) {
$manager_id = Db::name('department')->where('id', $this->did)->value('manager_id');
if (empty($manager_id)) {
$manager = get_department_manager($this->uid);
if (empty($manager)) {
return to_assign(1,'当前部门负责人不存在');
}
}
// 上一级部门负责人
// 上级部门负责人
if ($item['flow_type'] == 2) {
$pid = Db::name('department')->where('id', $this->did)->value('pid');
if (empty($pid)) {
return to_assign(1,'上一级部门不存在');
}
$manager_id = Db::name('department')->where('id', $pid)->value('manager_id');
if (empty($manager_id)) {
return to_assign(1,'上一级部门负责人不存在');
$manager = get_department_manager($this->uid, 1);
if (empty($manager)) {
return to_assign(1,'上级部门负责人不存在');
}
}
// 当前部门分管领导
if ($item['flow_type'] == 5) {
$leader_id = Db::name('department')->where('id', $this->did)->value('leader_id');
if (empty($leader_id)) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
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,'上一级部门分管领导不存在');
$leader = get_department_leader($this->uid, 1);
if (empty($leader)) {
return to_assign(1,'上级部门分管领导不存在');
}
}
}
@ -207,23 +199,23 @@ class Invoice extends BaseController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];
@ -287,23 +279,23 @@ class Invoice extends BaseController
if (!isset($param['check_admin_ids'])) {
if($flow[0]['flow_type'] == 1){
// 部门负责人
$leader = get_department_leader($this->uid);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：当前部门负责人还未设置，请联系HR或者管理员');
}
else{
$param['check_admin_ids'] = $leader;
}
$manager = get_department_manager($this->uid);
$param['check_admin_ids'] = $manager;
}
else if($flow[0]['flow_type'] == 2){
// 上级部门负责人
$leader = get_department_leader($this->uid,1);
if($leader == 0){
return to_assign(1,'审批流程设置有问题：上级部门负责人还未设置，请联系HR或者管理员');
$manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager;
}
else{
else if($flow[0]['flow_type'] == 5){
// 部门分管领导
$leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader;
}
else if($flow[0]['flow_type'] == 6){
// 上级部门分管领导
$leader = get_department_leader($this->uid, 1);
$param['check_admin_ids'] = $leader;
}
else{
$param['check_admin_ids'] = $flow[0]['flow_uids'];