diff --git a/app/adminapi/logic/oa/FlowApproveLogic.php b/app/adminapi/logic/oa/FlowApproveLogic.php index 34f475e01..2006bda3e 100644 --- a/app/adminapi/logic/oa/FlowApproveLogic.php +++ b/app/adminapi/logic/oa/FlowApproveLogic.php @@ -36,19 +36,21 @@ class FlowApproveLogic extends BaseLogic $copy = Admin::where('id','in',$flow['copy_uids'])->column('name'); //当前审核人 $current_check_user = ''; + $current_check_user_ids = ''; //获取审核步骤 $step = FlowStep::field('flow_step,flow_user,is_active')->where('approve_id',$data['id'])->order('sort asc')->select()->each(function($item)use($create_user,&$current_check_user){ $item['flow_step_text'] = $item->flow_step_text; if($item['flow_step'] == 0){ $item['flow_step_text'] = $create_user['name'].'创建'; - $item['flow_user'] = ''; + $item['flow_user_name'] = ''; }else{ $item['flow_step_text'] = $item->flow_step_text; $flow_user = Admin::where('id','in',$item['flow_user'])->column('name'); - $item['flow_user'] = implode(',',$flow_user); + $item['flow_user_name'] = implode(',',$flow_user); } if($item['is_active'] == 1){ - $current_check_user = $item['flow_user']; + $current_check_user = $item['flow_user_name']; + $current_check_user_ids = $item['flow_user']; } })->toArray(); //获取审批记录