From 63f823700d515a50d6b46793cb6487ea4d145eaa Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 16 Dec 2023 10:08:08 +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/contract/ProcurementContractLists.php    | 6 +++++-
 .../model/contract/SubcontractingContractNegotiation.php    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php
index e2688d0d4..52585eee1 100644
--- a/app/adminapi/lists/contract/ProcurementContractLists.php
+++ b/app/adminapi/lists/contract/ProcurementContractLists.php
@@ -47,8 +47,12 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
         $queryWhere = [];   
         if (!empty($this->params['contract_cate'])) {
             $queryWhere['contract_cate'] = $this->params['contract_cate'];
+        } else {
+            $queryWhere['contract_cate'] = 2;
+        }
+        if (!empty($this->params['all'])) {
+            unset($queryWhere['contract_cate']);
         }
-        $queryWhere['contract_cate'] = 1;
         return $queryWhere;
     }
 
diff --git a/app/common/model/contract/SubcontractingContractNegotiation.php b/app/common/model/contract/SubcontractingContractNegotiation.php
index 7800462e8..e687303f8 100644
--- a/app/common/model/contract/SubcontractingContractNegotiation.php
+++ b/app/common/model/contract/SubcontractingContractNegotiation.php
@@ -32,7 +32,7 @@ class SubcontractingContractNegotiation extends BaseModel
 
     public function contract()
     {
-        return $this->belongsTo(\app\common\model\contract\SubcontractingContract::class, 'subcontracting_contract_id');
+        return $this->belongsTo(\app\common\model\contract\ProcurementContract::class, 'subcontracting_contract_id');
     }
     
 }
\ No newline at end of file