From cf2a365abe5101e870ce977b93d21067f2f2cf05 Mon Sep 17 00:00:00 2001 From: hdm Date: Wed, 15 Jun 2022 08:30:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=80=E5=88=97=E8=A1=A8=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/finance/controller/Expense.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/finance/controller/Expense.php b/app/finance/controller/Expense.php index 43890e4..bb6ad17 100644 --- a/app/finance/controller/Expense.php +++ b/app/finance/controller/Expense.php @@ -29,7 +29,7 @@ class Expense extends BaseController $item->income_month = empty($item->income_month) ? '-' : date('Y-m', $item->income_month); $item->expense_time = empty($item->expense_time) ? '-' : date('Y-m-d', $item->expense_time); $item->admin_name = Db::name('Admin')->where(['id' => $item->admin_id])->value('name'); - $item->department = Db::name('Department')->where(['id' => $item->admin_id])->value('title'); + $item->department = Db::name('Department')->where(['id' => $item->did])->value('title'); $item->pay_name = Db::name('Admin')->where(['id' => $item->pay_admin_id])->value('name'); $item->pay_time = empty($item->pay_time) ? '-' : date('Y-m-d H:i', $item->pay_time); $item->amount = Db::name('ExpenseInterfix')->where(['exid' => $item->id])->sum('amount'); @@ -48,7 +48,7 @@ class Expense extends BaseController $item->income_month = empty($item->income_month) ? '-' : date('Y-m', $item->income_month); $item->expense_time = empty($item->expense_time) ? '-' : date('Y-m-d', $item->expense_time); $item->admin_name = Db::name('Admin')->where(['id' => $item->admin_id])->value('name'); - $item->department = Db::name('Department')->where(['id' => $item->admin_id])->value('title'); + $item->department = Db::name('Department')->where(['id' => $item->did])->value('title'); $item->pay_name = Db::name('Admin')->where(['id' => $item->pay_admin_id])->value('name'); $item->pay_time = empty($item->pay_time) ? '-' : date('Y-m-d H:i', $item->pay_time); $item->amount = Db::name('ExpenseInterfix')->where(['exid' => $item->id])->sum('amount');