hawind
/
gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正流程结束时无法正常执行

This commit is contained in:
乐风 2021-04-12 02:33:22 +08:00
parent 12d70a9192
commit 107b6bff21
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Gdoo/Model/Services/StepService.php
View File

@ -41,9 +41,9 @@ class StepService
$step_next = $step_user['step']; $step_next = $step_user['step'];
$continue = $step_user['continue']; $continue = $step_user['continue'];
$ret[$step_id] = $step_next; $ret[$step_id] = $step_next;
// 节点是审核节点时不再获取下一个节点 // 节点是审核节点时不再获取下一个节点
if ($step['option'] == 1) { if ($step_next['option'] == 1) {
if ($continue) { if ($continue) {
continue; continue;
} }
@ -129,12 +129,14 @@ class StepService
$parent_user_ids = DB::table('model_run_log') $parent_user_ids = DB::table('model_run_log')
->where('run_id', $run_id) ->where('run_id', $run_id)
->where('parent_id', $parent_log['parent_id']) ->where('parent_id', $parent_log['parent_id'])
->get()->toArray(); ->where('option', 1)
->pluck('user_id')->toArray();
} else { } else {
// 退回到开始取最后一个开始节点 // 退回到开始取最后一个开始节点
$parent_user_id = DB::table('model_run_log') $parent_user_id = DB::table('model_run_log')
->where('run_id', $run_id) ->where('run_id', $run_id)
->where('parent_id', $parent_log['parent_id']) ->where('parent_id', $parent_log['parent_id'])
->where('option', 1)
->orderBy('id', 'desc') ->orderBy('id', 'desc')
->value('user_id'); ->value('user_id');
$parent_user_ids = [$parent_user_id]; $parent_user_ids = [$parent_user_id];