From d4fe5e76a5125f418a077cf5369fcbe4280bae80 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 7 Aug 2023 15:31:59 +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/informationg/UserInformationgLogic.php | 2 ++
 app/api/controller/CompanyController.php                  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app/adminapi/logic/informationg/UserInformationgLogic.php b/app/adminapi/logic/informationg/UserInformationgLogic.php
index 84658e658..b14e385d0 100644
--- a/app/adminapi/logic/informationg/UserInformationgLogic.php
+++ b/app/adminapi/logic/informationg/UserInformationgLogic.php
@@ -149,6 +149,8 @@ class UserInformationgLogic extends BaseLogic
                     'id' => $v['id'],
                     'category_id' => $v['category_id'],
                     'category_child' => $v['category_child'],
+                    'create_time' => $v['create_time'],
+                    'update_time' => $v['update_time'],
                     'datas' => $a
                 ];
                 if ($a) {
diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index 212d3dd19..9c8fcd333 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -59,6 +59,9 @@ class CompanyController extends BaseApiController
         $company = $query->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name'])->toArray();
         $company['other_contacts'] = json_decode($company['other_contacts'], true);
         $company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : '';
+        if($company['qualification'] && isset($company['qualification']['other_qualifications'])){
+            $company['qualification']['other_qualifications']=json_decode($company['qualification']['other_qualifications'],true);
+        }
         $contract = Contract::where('party_b',$id)->find();
         if (!empty($contract)) {
             if ($contract['type'] == 2) {