Merge pull request '拒绝后再次审批' (#27) from zm into master

Reviewed-on: mengfucius/wkcrm#27
pull/40/head
张萌 2 years ago
commit f2f72b2fd5

@ -399,13 +399,14 @@ class Business extends ApiCommon
if ($businessInfo['is_end']) { if ($businessInfo['is_end']) {
return resultArray(['error' => '已结束,请勿重复提交']); return resultArray(['error' => '已结束,请勿重复提交']);
} }
if ($businessInfo['flow_id']) { if ($businessInfo['flow_id'] && [$businessInfo]['check_status'] != 0) {
return resultArray(['error' => '已有审批流程,请勿重复提交']); return resultArray(['error' => '已有审批流程,请勿重复提交']);
} }
$data = []; $data = [];
$data['submit_end_status'] = $is_end; $data['submit_end_status'] = $is_end;
$data['submit_remark'] = $remark; $data['submit_remark'] = $remark;
$data['check_status'] = 0;
if (($examineStatus != false && $examineStatus != 'false') || $examineStatus == 1) { if (($examineStatus != false && $examineStatus != 'false') || $examineStatus == 1) {
// 审核判断(是否有符合条件的审批流) // 审核判断(是否有符合条件的审批流)
$examineFlowModel = new \app\admin\model\ExamineFlow(); $examineFlowModel = new \app\admin\model\ExamineFlow();
@ -451,7 +452,7 @@ class Business extends ApiCommon
Message::CUSTOMER_CHECK_TO_DO, Message::CUSTOMER_CHECK_TO_DO,
[ [
'title' => $param['name'], 'title' => $param['name'],
'action_id' => param['business_id'], 'action_id' => $param['business_id'],
], ],
$send_user_id $send_user_id
); );

Loading…
Cancel
Save