diff --git a/app/adminapi/controller/works/bgsp/OaApproveController.php b/app/adminapi/controller/works/bgsp/OaApproveController.php index c63c39446..5200418f2 100644 --- a/app/adminapi/controller/works/bgsp/OaApproveController.php +++ b/app/adminapi/controller/works/bgsp/OaApproveController.php @@ -125,6 +125,7 @@ $param['create_time'] = time(); $param['type'] = $flow['flow_cate']; $param['extends'] = !empty($param['extends']) ? json_encode($param['extends']) : null; + $param['copy_uids'] = !empty($param['copy_uids']) ? $param['copy_uids'] : $flow['copy_uids']; if (empty($param['check_admin_ids'])) { $flow_list = unserialize($flow['flow_list']); if($flow_list[0]['flow_type'] == 1){ @@ -481,7 +482,6 @@ $map[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',f.copy_uids)")]; $page_no = !empty($params['page_no']) ? $params['page_no'] : 1; $page_size = !empty($params['page_size']) ? $params['page_size'] : 15; - $lists = Db::name('oa_approve') ->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name') ->alias('f') diff --git a/app/adminapi/controller/works/finance/ExpenseController.php b/app/adminapi/controller/works/finance/ExpenseController.php index 82f60dda3..bee3205dc 100644 --- a/app/adminapi/controller/works/finance/ExpenseController.php +++ b/app/adminapi/controller/works/finance/ExpenseController.php @@ -34,6 +34,7 @@ return $this->fail("当前审批流程未设置完全"); } } + $params['copy_uids'] = !empty($params['copy_uids']) ? $params['copy_uids'] : $flow['copy_uids']; if (empty($params['check_admin_ids'])) { $flow_list = unserialize($flow['flow_list']); if($flow_list[0]['flow_type'] == 1){ diff --git a/app/adminapi/controller/works/finance/InvoiceController.php b/app/adminapi/controller/works/finance/InvoiceController.php index 53b0ed549..eff82d77c 100644 --- a/app/adminapi/controller/works/finance/InvoiceController.php +++ b/app/adminapi/controller/works/finance/InvoiceController.php @@ -31,6 +31,7 @@ return $this->fail("当前审批流程未设置完全"); } } + $params['copy_uids'] = !empty($params['copy_uids']) ? $params['copy_uids'] : $flow['copy_uids']; if (empty($params['check_admin_ids'])) { $flow_list = unserialize($flow['flow_list']); if($flow_list[0]['flow_type'] == 1){