From 83bda7ae6ac970a9ab50d2f22b57917c3c345f90 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 18 Nov 2023 15:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=A1=E6=A0=B8=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/FinanceExpense.php | 10 +++++++++-
 app/api/controller/FinanceInvoice.php | 10 +++++++++-
 app/api/controller/OaApprove.php      |  8 +++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

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{