From 0e30107b12aa73fcde972a0dd460471466577025 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Dec 2023 11:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=A5=E9=94=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/expense/ExpenseReimbursementLists.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/adminapi/lists/expense/ExpenseReimbursementLists.php b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
index e9b340bee..ad5b4dc8f 100644
--- a/app/adminapi/lists/expense/ExpenseReimbursementLists.php
+++ b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
@@ -38,7 +38,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['reimburser', 'reimbursement_date', 'customer_id', 'payee_name', 'payee_account'],
+            '=' => ['er.reimburser', 'er.reimbursement_date', 'er.customer_id', 'er.payee_name', 'er.payee_account'],
         ];
     }
 
@@ -54,13 +54,6 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
      */
     public function lists(): array
     {
-        return ExpenseReimbursement::where($this->searchWhere)
-            ->field(['id', 'org_id', 'dept_id', 'approve_id', 'reimburser', 'reimbursement_date', 'customer_id', 'pay_type', 'reimbursement_amount', 'reimbursement_amount_daxie', 'payee_name', 'payee_bank', 'payee_account', 'remark', 'annex'])
-            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
-        
         return Db::name('ExpenseReimbursement')->alias('er')
             ->where($this->searchWhere)
             ->leftJoin('orgs o','o.id = er.org_id')