|
|
@@ -34,13 +34,13 @@ class ProcessWait extends Model
|
|
|
|
|
|
//把上一个节点改成已完成
|
|
|
Db::name('process_wait')
|
|
|
- ->where(['order_type' => $data['order_type'], 'order_process' => $data['action_status']])
|
|
|
+ ->where(['order_type' => $data['order_type'], 'order_process' => $data['action_status'], 'order_code' => $data['order_code'], 'order_id' => $data['order_id'], 'status' => self::$status_wait_handle])
|
|
|
->update(['status' => self::$status_handle_finish, 'updatetime' => date('Y-m-d H:i:s')]);
|
|
|
|
|
|
//查询流程下该节点值的id
|
|
|
$id = Db::name('process')
|
|
|
->alias('a')
|
|
|
- ->leftJoin('action_process p', 'p.process_id=a.id AND p.order_process=' . $data['action_process'])
|
|
|
+ ->join('action_process p', 'p.process_id=a.id AND p.order_process=' . $data['action_process'] . ' AND p.operation_type = ' . ActionProcess::$operation_type_approval)
|
|
|
->where(['a.process_type' => $data['order_type'], 'a.is_del' => Process::$is_del_normal])->value('p.id', 0);
|
|
|
|
|
|
$roleid = [];
|
