From 541ae150272f6ca68f7d82582b8c52830064692f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 12 Aug 2023 10:04:31 +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/lists/CompanyLists.php |  2 +-
 app/common/model/Company.php        | 10 ++++++++++
 vendor/ebaoquan/junziqian_sdk       |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/CompanyLists.php b/app/adminapi/lists/CompanyLists.php
index be58b99d3..d4376566a 100644
--- a/app/adminapi/lists/CompanyLists.php
+++ b/app/adminapi/lists/CompanyLists.php
@@ -88,7 +88,7 @@ class CompanyLists extends BaseAdminDataLists implements ListsSearchInterface
          }
         return Company::where($this->searchWhere)
             ->where($where)
-            ->field(['is_authentication','id', 'level_two', 'level_one', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'deposit', 'deposit_time', 'qualification', 'status'])
+            ->field(['is_authentication','id', 'id contract', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'area_manager', 'is_contract', 'deposit', 'deposit_time', 'status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->withAttr('company_type',function($value,$data){
diff --git a/app/common/model/Company.php b/app/common/model/Company.php
index 2c6c3221d..f57c50744 100644
--- a/app/common/model/Company.php
+++ b/app/common/model/Company.php
@@ -14,6 +14,7 @@
 
 namespace app\common\model;
 
+use app\common\model\contract\Contract;
 use app\common\model\dict\DictData;
 use think\facade\Db;
 
@@ -57,4 +58,13 @@ class Company extends BaseModel
         return Db::name('admin')->where(['id' => $this->area_manager])->value('name');
     }
 
+    public function getContractAttr()
+    {
+        $find=Contract::where('party_a', $this->id)->field('check_status,status')->find();
+        if($find){
+            return $find->toArray();
+        }else{
+            return [];
+        }
+    }
 }
\ No newline at end of file
diff --git a/vendor/ebaoquan/junziqian_sdk b/vendor/ebaoquan/junziqian_sdk
index 1294ea49f..9acc82cd2 160000
--- a/vendor/ebaoquan/junziqian_sdk
+++ b/vendor/ebaoquan/junziqian_sdk
@@ -1 +1 @@
-Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74
+Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049