From 63aed90d9ae17177ec6d3676670b743734a6bf34 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Dec 2023 14:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/expense/ExpenseReimbursementLists.php | 8 +++++++-
 app/adminapi/lists/finance/FinancePaymentApplyLists.php  | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/expense/ExpenseReimbursementLists.php b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
index ad5b4dc8f..4cedbaf41 100644
--- a/app/adminapi/lists/expense/ExpenseReimbursementLists.php
+++ b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
@@ -56,6 +56,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
     {
         return Db::name('ExpenseReimbursement')->alias('er')
             ->where($this->searchWhere)
+            ->whereNull('er.delete_time')
             ->leftJoin('orgs o','o.id = er.org_id')
             ->leftJoin('dept d','d.id = er.dept_id')
             ->leftJoin('custom ct','ct.id = er.customer_id')
@@ -81,7 +82,12 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
      */
     public function count(): int
     {
-        return ExpenseReimbursement::where($this->searchWhere)->count();
+        return Db::name('ExpenseReimbursement')->alias('er')
+        ->where($this->searchWhere)
+        ->whereNull('er.delete_time')
+        ->leftJoin('orgs o','o.id = er.org_id')
+        ->leftJoin('dept d','d.id = er.dept_id')
+        ->leftJoin('custom ct','ct.id = er.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/finance/FinancePaymentApplyLists.php b/app/adminapi/lists/finance/FinancePaymentApplyLists.php
index 52cf078f3..21f4111f5 100644
--- a/app/adminapi/lists/finance/FinancePaymentApplyLists.php
+++ b/app/adminapi/lists/finance/FinancePaymentApplyLists.php
@@ -57,6 +57,7 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch
     {
         return Db::name('FinancePaymentApply')->alias('fpa')
             ->where($this->searchWhere)
+            ->whereNull('fpa.delete_time')
             ->leftJoin('procurement_contract pc','pc.id = fpa.contract_id')
             ->leftJoin('project p','p.id = pc.project_id')
             ->field('fpa.*, p.id as project_id, p.name as project_name, p.project_code, pc.contract_no')
@@ -85,6 +86,7 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch
     {
         return Db::name('FinancePaymentApply')->alias('fpa')
         ->where($this->searchWhere)
+        ->whereNull('fpa.delete_time')
         ->leftJoin('procurement_contract pc','pc.id = fpa.contract_id')
         ->leftJoin('project p','p.id = pc.project_id')->count();
     }