From 61e6fb589fe457d97ea086c2da5bd2ef310e0370 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 23 Jan 2024 10:41:11 +0800
Subject: [PATCH] update

---
 .../logic/contract/SubcontractingContractNegotiationLogic.php | 4 ++--
 .../model/contract/SubcontractingContractNegotiation.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php b/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
index 60a6ad2fa..65e390a1a 100644
--- a/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
+++ b/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
@@ -91,8 +91,8 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
 	            'warranty_expire_date' => !empty($params['Warranty_expire_date']) ? strtotime($params['Warranty_expire_date']) : 0,
 	            'negotiation_content' => $params['negotiation_content'] ?? '',
 	            'negotiation_detail' => $params['negotiation_detail'] ?? '',
-	            'negotiation_quotation' => !empty($params['negotiation_quotation']) ? $params['negotiation_quotation'] : null,
-	            'negotiation_basis' => !empty($params['negotiation_basis']) ? $params['negotiation_basis'] : null,
+	            'negotiation_quotation' => $params['negotiation_quotation'] ? json_encode($params['negotiation_quotation']) : null,
+	            'negotiation_basis' => $params['negotiation_basis'] ? json_encode($params['negotiation_basis']) : null,
 	            'update_time' => time(),
             ]);
             Db::commit();
diff --git a/app/common/model/contract/SubcontractingContractNegotiation.php b/app/common/model/contract/SubcontractingContractNegotiation.php
index ddfc6b814..f79c4681e 100644
--- a/app/common/model/contract/SubcontractingContractNegotiation.php
+++ b/app/common/model/contract/SubcontractingContractNegotiation.php
@@ -51,7 +51,7 @@ class SubcontractingContractNegotiation extends BaseModel
 	
 	public function getNegotiationTypeTextAttr($value,$data){
 		$dict = DictData::where('type_value','negotiation_type')->column('name','value');
-		return $dict[$data['negotiation_type']];
+		return !empty($data['negotiation_type']) ? $dict[$data['negotiation_type']] : '';
 	}
     
 }
\ No newline at end of file