diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php index 87cec1e89..af047d4c9 100644 --- a/app/adminapi/controller/CompanyController.php +++ b/app/adminapi/controller/CompanyController.php @@ -407,13 +407,13 @@ class CompanyController extends BaseAdminController // 插入审批流 $approveModel->type = $shopApproveType == 1? 2: 3; // 审批类型,后台配置 1 其他任务 2商户入驻 3开通交易 $approveModel->flow_id = 2; - $approveModel->name = $shopApproveType == 1? '商户入驻审批': '商户开通交易审批'; + $approveModel->name = $shopApproveType == 1? '商户入驻审批': '开通交易审批'; $approveModel->admin_id = 0; // 后台发起人id 暂时为0 $approveModel->department_id = '0'; $approveModel->check_admin_ids = $company['admin_id']; // 当前审批人ID 镇管理公司负责人 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核 $approveModel->other_type = 6; - $approveModel->extend = json_encode($data); + $approveModel->extend = json_encode(array_merge($params, $data)); $approveModel->create_time = time(); $approveModel->update_time = time(); $approveModel->save();