mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-05-27 19:49:27 +08:00
parent ce3f2378cf
commit 3a24ddc46c
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/works/bgsp/OaApproveController.php
View File

@ -125,6 +125,7 @@
$param['create_time'] = time(); $param['create_time'] = time();
$param['type'] = $flow['flow_cate']; $param['type'] = $flow['flow_cate'];
$param['extends'] = !empty($param['extends']) ? json_encode($param['extends']) : null; $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'])) { if (empty($param['check_admin_ids'])) {
$flow_list = unserialize($flow['flow_list']); $flow_list = unserialize($flow['flow_list']);
if($flow_list[0]['flow_type'] == 1){ if($flow_list[0]['flow_type'] == 1){
@ -481,7 +482,6 @@
$map[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',f.copy_uids)")]; $map[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',f.copy_uids)")];
$page_no = !empty($params['page_no']) ? $params['page_no'] : 1; $page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$page_size = !empty($params['page_size']) ? $params['page_size'] : 15; $page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$lists = Db::name('oa_approve') $lists = Db::name('oa_approve')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name') ->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f') ->alias('f')

1
app/adminapi/controller/works/finance/ExpenseController.php
View File

@ -34,6 +34,7 @@
return $this->fail("当前审批流程未设置完全"); return $this->fail("当前审批流程未设置完全");
} }
} }
$params['copy_uids'] = !empty($params['copy_uids']) ? $params['copy_uids'] : $flow['copy_uids'];
if (empty($params['check_admin_ids'])) { if (empty($params['check_admin_ids'])) {
$flow_list = unserialize($flow['flow_list']); $flow_list = unserialize($flow['flow_list']);
if($flow_list[0]['flow_type'] == 1){ if($flow_list[0]['flow_type'] == 1){

1
app/adminapi/controller/works/finance/InvoiceController.php
View File

@ -31,6 +31,7 @@
return $this->fail("当前审批流程未设置完全"); return $this->fail("当前审批流程未设置完全");
} }
} }
$params['copy_uids'] = !empty($params['copy_uids']) ? $params['copy_uids'] : $flow['copy_uids'];
if (empty($params['check_admin_ids'])) { if (empty($params['check_admin_ids'])) {
$flow_list = unserialize($flow['flow_list']); $flow_list = unserialize($flow['flow_list']);
if($flow_list[0]['flow_type'] == 1){ if($flow_list[0]['flow_type'] == 1){