|
@@ -43,8 +43,8 @@ class ProcessWait extends Model
|
|
|
//查询流程下该节点值的id
|
|
|
$info = Db::name('process')
|
|
|
->alias('a')
|
|
|
- ->field('p.id,p.action_type')
|
|
|
- ->join('action_process p', 'p.process_id=a.id AND p.order_process=' . $data['action_process'] . ' AND p.operation_type = ' . ActionProcess::$operation_type_approval)
|
|
|
+ ->field('p.id,p.action_type,p.operation_type')
|
|
|
+ ->join('action_process p', 'p.process_id=a.id AND p.order_process=' . $data['action_process'])
|
|
|
->where(['a.process_type' => $data['order_type'], 'a.status' => Process::$status_normal, 'a.is_del' => Process::$is_del_normal])
|
|
|
->findOrEmpty();
|
|
|
|
|
@@ -57,6 +57,9 @@ class ProcessWait extends Model
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+ //如果是系统节点,不写入待办已办数据
|
|
|
+ if($info['operation_type'] == ActionProcess::$operation_type_approval) return true;
|
|
|
+
|
|
|
//如果是以下4个流程,还需要判断对应供应商是否开通账号,如果开通的话就不推送待办已办数据
|
|
|
if (in_array($data['order_type'], ['CKD', 'RKD', 'CGD', 'SPCB'])) {
|
|
|
|