From 3f03d474318ad8dfc2a2cedbd382ac9e570985a0 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 18 Dec 2023 10:20:06 +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/bid/BidBuyBiddingDocumentLists.php | 1 + app/adminapi/lists/finance/FinanceInvoiceApplyLists.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php index 2308e3f61..e37e40c9b 100644 --- a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php +++ b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php @@ -18,6 +18,7 @@ namespace app\adminapi\lists\bid; use app\adminapi\lists\BaseAdminDataLists; use app\common\model\bid\BidBuyBiddingDocument; use app\common\lists\ListsSearchInterface; +use think\facade\Db; /** diff --git a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php index e2207c410..fd815e646 100644 --- a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php +++ b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php @@ -60,9 +60,9 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id') ->leftJoin('project p','p.id = bbbd.project_id') ->leftJoin('custom ct','ct.id = fia.customer_id') - ->field('c.*, bbbd.project_id, p.name as project_name, ct.name as customer_name') + ->field('fia.*, bbbd.project_id, p.name as project_name, ct.name as customer_name') ->limit($this->limitOffset, $this->limitLength) - ->order(['c.id' => 'desc']) + ->order(['fia.id' => 'desc']) ->select()->each(function($item, $key){ //关联数据 供应商后续添加 $item['approve_no'] = '付款单号';