From 93a7f47c10d9490fa58b9247d5d87c9bd37d43fb Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 5 Aug 2023 16:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/contract/ContractLogic.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php
index a18319a21..b18062c17 100644
--- a/app/adminapi/logic/contract/ContractLogic.php
+++ b/app/adminapi/logic/contract/ContractLogic.php
@@ -118,8 +118,12 @@ class ContractLogic extends BaseLogic
         $data = Db::name('contract')->where('id', $params['id'])
             ->withAttr('party_b_info', function ($value, $data) {
                 if ($data['type'] == 1) {
-                    $filed=['id,company_name,organization_code,province,city,area,street,address,qualification'];
-                    $company=Db::name('company')->where('id', $data['party_b'])->field($filed)->find();
+                    $filed=['id,company_name,company_type,organization_code,province,city,area,street,address,qualification'];
+                    $company=Db::name('company')->where('id', $data['party_b'])->field($filed)
+                    ->withAttr('company_type_name', function ($value, $data) {
+                        return Db::name('dict_data')->where('id', $data['company_type'])->value('name');
+                    })
+                    ->find();
                     $company['qualification']=json_decode($company['qualification'],true);
                     return $company;
                 } else {
@@ -130,8 +134,12 @@ class ContractLogic extends BaseLogic
                 }
             })
             ->withAttr('party_a_info', function ($value, $data) {
-                $filed=['id,company_name,organization_code,province,city,area,street,address,qualification'];
-                $company=Db::name('company')->where('id', $data['party_a'])->field($filed)->find();
+                $filed=['id,company_name,company_type,organization_code,province,city,area,street,address,qualification'];
+                $company=Db::name('company')->where('id', $data['party_a'])
+                ->withAttr('company_type_name', function ($value, $data) {
+                    return Db::name('dict_data')->where('id', $data['company_type'])->value('name');
+                })
+                ->field($filed)->find();
                 $company['qualification']=json_decode($company['qualification'],true);
                 return $company;