From 4691a10b031e8c94e1c4d017e76318348ad67cd5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 30 Jul 2024 20:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=90=A5=E9=94=80=E5=90=88=E7=BA=A6=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=AD=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD=E5=8F=8A=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketing/MarketingFrameworkAgreementLogic.php     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php b/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
index 39bebe334..fe8954933 100644
--- a/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
+++ b/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
@@ -20,7 +20,8 @@
 	use app\common\model\dept\Dept;
 	use app\common\model\marketing\MarketingContract;
 	use app\common\model\marketing\MarketingCustom;
-	use app\common\model\oa\FlowApprove;
+use app\common\model\marketing\MarketingCustomContacts;
+use app\common\model\oa\FlowApprove;
 	use think\facade\Db;
 	
 	
@@ -50,7 +51,7 @@
 					'contract_code' => data_unique_code('KJXY'),
 					'agreement_nature' => $params['agreement_nature'],
 					'part_a' => $params['part_a'],
-					'part_a_contact' => $params['part_a_contact'] ?? '',
+					'part_a_contact' => $params['part_a_contact_name'] ?? '',
 					'part_a_address' => $params['part_a_address'] ?? '',
 					'part_b' => $params['part_b'],
 					'part_b_signatory' => $params['part_b_signatory'] ?? 0,
@@ -166,9 +167,10 @@
 			$data = MarketingContract::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
 			$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
 			$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
-			$admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
+			$admin = Admin::where('id', 'in', [$data['signed_head'], $data['seal_user']])->column('name', 'id');
+			$name=MarketingCustomContacts::where('id',$data['part_b_signatory'])->value('name');
 			$data['part_a_name'] = $custom['name'];
-			$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? '';
+			$data['part_b_signatory_name'] = $name ?? '';
 			$data['signed_dept_name'] = $dept['name'];
 			$data['signed_head_name'] = $admin[$data['signed_head']] ?? '';
 			$data['seal_user_name'] = $admin[$data['seal_user']] ?? '';