From 91420f1e50ddfe4ce1c7eac336a4a6a5f0c3ba6b Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Mon, 18 Apr 2022 18:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=873=E7=BA=A7=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=AC=AC=E4=B8=89=E7=BA=A7=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BA=BA=E6=B2=A1=E6=9C=89=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=92=8C=E6=8B=92=E7=BB=9D=E6=8C=89=E9=92=AE=20=20bug=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/oa/controller/Approve.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php
index f0cad3d..ae0b7cc 100644
--- a/app/oa/controller/Approve.php
+++ b/app/oa/controller/Approve.php
@@ -376,6 +376,7 @@ class Approve extends BaseController
 				//查询当前会签记录数
 				$check_count = Db::name('FlowRecord')->where(['action_id'=>$detail['id'],'type'=>1,'step_id'=>$step['id']])->count();
 				//当前会签记应有记录数
+				$param['check_admin_ids'] = $step['flow_uids'];
 				$flow_count = explode(',', $step['flow_uids']);
 				if(($check_count+1) >=count($flow_count)){
 					$next_step = Db::name('FlowStep')->where(['action_id'=>$detail['id'],'type'=>1,'sort'=>($detail['check_step_sort']+1),'delete_time'=>0])->find();
@@ -383,10 +384,12 @@ class Approve extends BaseController
 						//存在下一步审核
 						$param['check_step_sort'] = $detail['check_step_sort']+1;
 						$param['check_status'] = 1;
+						$param['check_admin_ids'] = $next_step['flow_uids'];
 					}
 					else{
 						//不存在下一步审核，审核结束
 						$param['check_status'] = 2;
+						$param['check_admin_ids'] ='';
 					}
 				}
 			}
@@ -402,7 +405,6 @@ class Approve extends BaseController
 					);
 					$fid = Db::name('FlowStep')->strict(false)->field(true)->insertGetId($flow_step);
 					//下一步审核步骤
-					$param['check_admin_ids'] = $param['check_admin_ids'];
 					$param['check_step_sort'] = $next_step;
 					$param['check_status'] = 1;
 				}