From 8953757e4172c5dcde9c9de55a33d1bc8bf4574f Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sun, 21 Jan 2024 15:30:17 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/bid/BidBiddingDecisionLists.php     | 2 +-
 app/adminapi/validate/bid/BidSecurityApplyValidate.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/bid/BidBiddingDecisionLists.php b/app/adminapi/lists/bid/BidBiddingDecisionLists.php
index 6ea672639..17dd21eb7 100644
--- a/app/adminapi/lists/bid/BidBiddingDecisionLists.php
+++ b/app/adminapi/lists/bid/BidBiddingDecisionLists.php
@@ -40,7 +40,7 @@ class BidBiddingDecisionLists extends BaseAdminDataLists implements ListsSearchI
     public function setSearch(): array
     {
         return [
-            '=' => ['project_id', 'bidding_project_fund_source', 'bid_type'],
+            '=' => ['project_id', 'bidding_project_fund_source', 'bid_type', 'is_margin'],
 	        '%like%' => ['code']
         ];
     }
diff --git a/app/adminapi/validate/bid/BidSecurityApplyValidate.php b/app/adminapi/validate/bid/BidSecurityApplyValidate.php
index 15c054c83..f08db26d6 100644
--- a/app/adminapi/validate/bid/BidSecurityApplyValidate.php
+++ b/app/adminapi/validate/bid/BidSecurityApplyValidate.php
@@ -112,6 +112,9 @@ class BidSecurityApplyValidate extends BaseValidate
 		if($data->isEmpty()){
 			return '投标决策信息不存在';
 		}
+		if($data['is_margin'] != 1){
+			return '此投标信息没有保证金';
+		}
 		return true;
 	}