111
This commit is contained in:
parent
f067685e93
commit
c10139c098
@ -38,7 +38,7 @@ class FlowApproveLogic extends BaseLogic
|
|||||||
$current_check_user = '';
|
$current_check_user = '';
|
||||||
$current_check_user_ids = '';
|
$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){
|
$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,&$current_check_user_ids){
|
||||||
$item['flow_step_text'] = $item->flow_step_text;
|
$item['flow_step_text'] = $item->flow_step_text;
|
||||||
if($item['flow_step'] == 0){
|
if($item['flow_step'] == 0){
|
||||||
$item['flow_step_text'] = $create_user['name'].'创建';
|
$item['flow_step_text'] = $create_user['name'].'创建';
|
||||||
@ -50,7 +50,7 @@ class FlowApproveLogic extends BaseLogic
|
|||||||
}
|
}
|
||||||
if($item['is_active'] == 1){
|
if($item['is_active'] == 1){
|
||||||
$current_check_user = $item['flow_user_name'];
|
$current_check_user = $item['flow_user_name'];
|
||||||
$current_check_user_ids = $item['flow_user'];
|
$current_check_user_ids = explode(',',$item['flow_user']);
|
||||||
}
|
}
|
||||||
})->toArray();
|
})->toArray();
|
||||||
//获取审批记录
|
//获取审批记录
|
||||||
@ -60,6 +60,7 @@ class FlowApproveLogic extends BaseLogic
|
|||||||
$data['flow_name'] = $flow['name'];
|
$data['flow_name'] = $flow['name'];
|
||||||
$data['check_status_text'] = $data->check_status_text;
|
$data['check_status_text'] = $data->check_status_text;
|
||||||
$data['current_check_user'] = $current_check_user;
|
$data['current_check_user'] = $current_check_user;
|
||||||
|
$data['current_check_user_ids'] = $current_check_user_ids;
|
||||||
$data['create_user_name'] = $create_user['name'];
|
$data['create_user_name'] = $create_user['name'];
|
||||||
$data['copy_user'] = implode(',',$copy);
|
$data['copy_user'] = implode(',',$copy);
|
||||||
$data['step'] = $step;
|
$data['step'] = $step;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user