diff --git a/app/adminapi/controller/works/finance/IncomeController.php b/app/adminapi/controller/works/finance/IncomeController.php index 18cc9ee5f..3e21753ea 100644 --- a/app/adminapi/controller/works/finance/IncomeController.php +++ b/app/adminapi/controller/works/finance/IncomeController.php @@ -29,7 +29,7 @@ }else{ $where[] = ['is_cash','in','0,1,2']; } - $lists = Db::name('oa_invoice')->field('id,is_cash,enter_amount,enter_time,type,invoice_title,amount,invoice_type,admin_id,create_time,code,open_time')->where('check_status',5)->where($where) + $lists = Db::name('oa_invoice')->field('id,is_cash,enter_amount,enter_time,type,invoice_title,amount,invoice_type,admin_id,create_time,code,open_time,check_admin_ids,open_admin_id')->where('check_status',5)->where($where) ->page($page_no, $page_size)->order('id desc')->select()->each(function($data){ $admin = Admin::field('name,dept_id')->where('id',$data['admin_id'])->findOrEmpty(); $dept = Dept::where('id',$admin['dept_id'])->value('name'); @@ -110,13 +110,13 @@ public function lists(){ $params = $this->request->get(['invoice_id']); - if(empty($params['id'])){ + if(empty($params['invoice_id'])){ return $this->fail('参数错误'); } $data = Db::name('oa_invoice_income')->where('inid',$params['invoice_id'])->order('create_time desc')->select()->each(function($data){ $data['enter_time'] = date('Y-m-d',$data['enter_time']); $data['admin_name'] = Admin::where('id',$data['admin_id'])?->value('name'); - }); + })->toArray(); return $this->data($data); } } \ No newline at end of file