From eff40225f5b6a0c4094785983862e6ec2a42a473 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Wed, 29 May 2024 11:15:18 +0800 Subject: [PATCH] update --- app/adminapi/controller/works/finance/ExpenseController.php | 2 +- app/adminapi/controller/works/finance/InvoiceController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/adminapi/controller/works/finance/ExpenseController.php b/app/adminapi/controller/works/finance/ExpenseController.php index 38c1922a4..f5e2fc46a 100644 --- a/app/adminapi/controller/works/finance/ExpenseController.php +++ b/app/adminapi/controller/works/finance/ExpenseController.php @@ -700,7 +700,7 @@ }else{ $where[] = ['check_status','=',2]; } - $lists = Db::name('oa_expense')->field('id,code,income_month,expense_time,admin_id,check_admin_ids,check_status,pay_admin_id,pay_time,create_time,detail')->where('admin_id',$this->adminId)->where($where) + $lists = Db::name('oa_expense')->field('id,code,income_month,expense_time,admin_id,check_admin_ids,check_status,pay_admin_id,pay_time,create_time,detail')->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'); diff --git a/app/adminapi/controller/works/finance/InvoiceController.php b/app/adminapi/controller/works/finance/InvoiceController.php index 827872008..3294dbe60 100644 --- a/app/adminapi/controller/works/finance/InvoiceController.php +++ b/app/adminapi/controller/works/finance/InvoiceController.php @@ -688,7 +688,7 @@ }else{ $where[] = ['check_status','in','2,5,10']; } - $lists = Db::name('oa_invoice')->field('id,type,invoice_title,invoice_subject,amount,invoice_type,check_status,admin_id,create_time,check_admin_ids,open_admin_id,open_time,code,delivery')->where('admin_id',$this->adminId)->where($where) + $lists = Db::name('oa_invoice')->field('id,type,invoice_title,invoice_subject,amount,invoice_type,check_status,admin_id,create_time,check_admin_ids,open_admin_id,open_time,code,delivery')->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');