From d505aeffab033f5a32816b23d6cc17b02c31b2ae Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 14 Sep 2023 12:08:16 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=95=86=E6=88=B7=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/ShopContractLogic.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/logic/ShopContractLogic.php b/app/adminapi/logic/ShopContractLogic.php
index 75f204287..63f53c15b 100644
--- a/app/adminapi/logic/ShopContractLogic.php
+++ b/app/adminapi/logic/ShopContractLogic.php
@@ -119,6 +119,10 @@ class ShopContractLogic extends BaseLogic
                 province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name,
                 qualification'];
                 $shopMerchant = ShopMerchant::where(['id' => $data['party_b']])->field($field)->find()->toArray();
+                $shopMerchant['qualification'] = json_decode($shopMerchant['qualification'], true);
+                if($shopMerchant['qualification'] && isset($shopMerchant['qualification']['other_qualifications'])){
+                    $shopMerchant['qualification']['other_qualifications']=json_decode($shopMerchant['qualification']['other_qualifications'],true);
+                }
                 return $shopMerchant;
             })
             ->withAttr('party_a_info', function ($value, $data) {
@@ -126,7 +130,9 @@ class ShopContractLogic extends BaseLogic
                 province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name,
                 qualification'];
                 $shopMerchant = ShopMerchant::where(['id' => $data['party_a']])->field($field)->find()->toArray();
-
+                if($shopMerchant['qualification'] && isset($shopMerchant['qualification']['other_qualifications'])){
+                    $shopMerchant['qualification']['other_qualifications']=json_decode($shopMerchant['qualification']['other_qualifications'],true);
+                }
                 return $shopMerchant;
             })
             ->withAttr('status_name', function ($value, $data) {