From 2af945ac0eaa63589438521bdef78d1a682b50ec Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 17:43:08 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=85=AC=E5=8F=B8=E7=94=B3=E8=AF=B7=E7=94=A8?=
 =?UTF-8?q?=E8=BD=A6=E9=87=8D=E5=A4=8D=E5=92=8C=E5=8F=96=E6=B6=88=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6=E5=9B=9E=E8=B0=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/IndexController.php   | 2 +-
 app/api/controller/VehicleController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index f72154ac4..1fc38031a 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -335,7 +335,7 @@ class IndexController extends BaseApiController
             //获取租赁车辆信息
             $vehicleRentInfo = VehicleRent::where('car_id', $vehicle['id'])->find();
             //更新原始合同类型
-            VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['type' => 2]);
+            VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['status' => 6]);
             VehicleRent::where('car_id', $vehicle['id'])->update([
                 'status' => 3,
             ]);
diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 471c8f776..2c6bdc2e9 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -237,7 +237,7 @@ class VehicleController extends BaseApiController
             return $this->fail('当前镇街公司未签约');
         }
         //判断是否申请过
-        $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->where('status','<>',4)->find();
+        $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->whereNotIn('status','4,5,6')->find();
         if(!empty($vehicleContract)){
             return $this->fail('请勿重复申请');
         }

From e9b5bca0da1a4951d4aaf29ba6b4b0bd40759b33 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 18:27:27 +0800
Subject: [PATCH 02/12] debug

---
 app/adminapi/controller/CompanyController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 9d0629f5b..04b15483f 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -30,6 +30,7 @@ use app\common\logic\contract\ContractLogic;
 use app\common\model\contract\Contract;
 use app\common\model\task_scheduling\TaskScheduling;
 use app\common\model\user\User;
+use think\facade\Log;
 
 /**
  * Company控制器
@@ -200,6 +201,7 @@ class CompanyController extends BaseAdminController
                 'id' => $company['id'],
             ];
             $res = app(JunziqianController::class)->EnterpriseCertification($data);
+            Log::info(['企业认证同步结果',$res]);
             if ($res->success == true) {
                 $email = $res->data;
                 // 企业人脸上传

From 0f54f56a4d23a12eecdc514b4f901c249c3e88f4 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 19:18:44 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=AD=BE=E7=BA=A6?=
 =?UTF-8?q?=E8=AF=81=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/IndexController.php     |  7 ++++++-
 app/api/controller/JunziqianController.php | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 1fc38031a..5798b04be 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -32,7 +32,7 @@ use think\response\Json;
  */
 class IndexController extends BaseApiController
 {
-    public array $notNeedLogin = ['index', 'config', 'policy', 'decorate', 'notifyUrl', 'notifyProperty', 'notifyAuthentication', 'notifyVehicleContractUpdate', 'systemCarRent', 'selfCarRent', 'cancelRent'];
+    public array $notNeedLogin = ['test','index', 'config', 'policy', 'decorate', 'notifyUrl', 'notifyProperty', 'notifyAuthentication', 'notifyVehicleContractUpdate', 'systemCarRent', 'selfCarRent', 'cancelRent'];
 
     /**
      * @notes 首页数据
@@ -49,6 +49,11 @@ class IndexController extends BaseApiController
         return $this->data($result);
     }
 
+    public function test() {
+        $res = app(JunziqianController::class)->downloadVehicleContractEvidence('APL1699006920226521088','泸县供投里海农业科技有限公司','91510521MAC477XA13');
+        dump($res);
+    }
+
 
     /**
      * @notes 全局配置
diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index 8b571e3c9..3cd3c1bfe 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -216,6 +216,27 @@ class JunziqianController extends BaseApiController
         }
     }
 
+    public function downloadVehicleContractEvidence($applyNo,$companyName,$companyCode) {
+        //构建请求工具
+        $requestUtils=new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
+        //初始化合同参数
+        $request=array(
+            "applyNo" => $applyNo,
+            "fullName" => $companyName, //签约人名称（合同发起接口中传入的签署人姓名）
+            "identityCard" => $companyCode, //统一社会信用代码
+            "identityType" => 12, //证件类型 1身份证, 2护照, 3台胞证, 4港澳居民来往内地通行证, 11营业执照, 12统一社会信用代码, 20子账号, 99其他
+            "evidenceType" => 0 //证据类型,0图片,1视频,2人脸证据
+        );
+        $response = $requestUtils->doPost("/v2/sign/evidenceLinkFile",$request);
+        if ($response->success) {
+            $resData = (array)$response->data;
+            $this->getDownload($resData['link'], root_path() . 'public/uploads/vehicle_contract/' . $applyNo . '.png');
+            return env('project.website_domain').'/uploads/vehicle_contract/' . $applyNo . '.png';
+        } else {
+            return false;
+        }
+    }
+
     public function SigningLink($data)
     {
         //构建请求工具

From 986c91ee93bc921ccee2646b5069389b7cd23267 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 20:50:58 +0800
Subject: [PATCH 04/12] debug

---
 app/api/controller/JunziqianController.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index 3cd3c1bfe..ce198e4c0 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -79,6 +79,10 @@ class JunziqianController extends BaseApiController
         $request->legalName = $data["master_name"]; //法人
         $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要
         $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 签约时短信验证需要
+        if ($data['id'] == 23) {
+            $request->authorizeName = '陈波';
+            $request->authorizeCard = '510522199206071952';
+        }
         if (isset($data['master_email'])) {
             $request->emailOrMobile = $data['master_email']; //邮箱
         }
@@ -174,7 +178,12 @@ class JunziqianController extends BaseApiController
         $request-> legalMobile = $data['master_phone'];
         $request-> faceAgantIdenName = $data['master_name'];
         $request-> faceAgantIdenCard = $data['master_id_card'];
-        $request-> backUrl = env('url.url_prefix').'/api/Hetong/notifyOrganizationFaceCreate'; // 做完人脸识别后，指定跳转到供销系统mobile首页
+        if($data['id'] == 23) {
+            $request-> facePerType = 1;
+            $request-> faceAgantIdenName = '陈波';
+            $request-> faceAgantIdenCard = '510522199206071952';
+        }
+        $request-> backUrl = env('url.url_prefix').'/api/Hetong/notifyOrganizationFaceCreate';
         $response = $requestUtils->doPost("/v2/user/organizationFaceCreate",$request);
         return $response;
     }

From cb1aa2394c8ee4ac6832bd8892e50f781ecf2aa5 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 20:55:33 +0800
Subject: [PATCH 05/12] debug

---
 app/api/controller/JunziqianController.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index ce198e4c0..5362ed4c1 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -79,10 +79,10 @@ class JunziqianController extends BaseApiController
         $request->legalName = $data["master_name"]; //法人
         $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要
         $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 签约时短信验证需要
-        if ($data['id'] == 23) {
-            $request->authorizeName = '陈波';
-            $request->authorizeCard = '510522199206071952';
-        }
+        // todo 调试代码
+        $request->authorizeName = '陈波';
+        $request->authorizeCard = '510522199206071952';
+
         if (isset($data['master_email'])) {
             $request->emailOrMobile = $data['master_email']; //邮箱
         }
@@ -172,17 +172,17 @@ class JunziqianController extends BaseApiController
         $request-> email = $data['master_email'];
         $request-> enterpriseName = $data['company_name'];
         $request-> identityNo = $data['organization_code'];
-        $request-> facePerType = 0;
+//        $request-> facePerType = 0;
         $request-> legalPersonName = $data['master_name'];
         $request-> legalIdentityCard = $data['master_id_card'];//法人证件号
         $request-> legalMobile = $data['master_phone'];
         $request-> faceAgantIdenName = $data['master_name'];
         $request-> faceAgantIdenCard = $data['master_id_card'];
-        if($data['id'] == 23) {
-            $request-> facePerType = 1;
-            $request-> faceAgantIdenName = '陈波';
-            $request-> faceAgantIdenCard = '510522199206071952';
-        }
+
+        $request-> facePerType = 1;
+        $request-> faceAgantIdenName = '陈波';
+        $request-> faceAgantIdenCard = '510522199206071952';
+
         $request-> backUrl = env('url.url_prefix').'/api/Hetong/notifyOrganizationFaceCreate';
         $response = $requestUtils->doPost("/v2/user/organizationFaceCreate",$request);
         return $response;

From 8439c01d8fdb88c8a103c0081f65fec5d3746b68 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 21:06:29 +0800
Subject: [PATCH 06/12] debug

---
 app/api/controller/JunziqianController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index 5362ed4c1..42e1cd1a3 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -80,8 +80,8 @@ class JunziqianController extends BaseApiController
         $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要
         $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 签约时短信验证需要
         // todo 调试代码
-        $request->authorizeName = '陈波';
-        $request->authorizeCard = '510522199206071952';
+        $request->authorizeName = '马开明';
+        $request->authorizeCard = '5105004199408240010';
 
         if (isset($data['master_email'])) {
             $request->emailOrMobile = $data['master_email']; //邮箱
@@ -180,8 +180,8 @@ class JunziqianController extends BaseApiController
         $request-> faceAgantIdenCard = $data['master_id_card'];
 
         $request-> facePerType = 1;
-        $request-> faceAgantIdenName = '陈波';
-        $request-> faceAgantIdenCard = '510522199206071952';
+        $request-> faceAgantIdenName = '马开明';
+        $request-> faceAgantIdenCard = '5105004199408240010';
 
         $request-> backUrl = env('url.url_prefix').'/api/Hetong/notifyOrganizationFaceCreate';
         $response = $requestUtils->doPost("/v2/user/organizationFaceCreate",$request);

From 6f9f49bf79115b9d0f330415f81147d55f29d835 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 21:16:13 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/JunziqianController.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index 42e1cd1a3..25e8bfd90 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -77,11 +77,8 @@ class JunziqianController extends BaseApiController
         $request->organizationRegNo = $data['organization_code'];
         $request->organizationRegImg = $data['business_license']; //new CURLFile('D:/tmp/test.png',null,"test.png");
         $request->legalName = $data["master_name"]; //法人
-        $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要
-        $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 签约时短信验证需要
-        // todo 调试代码
-        $request->authorizeName = '马开明';
-        $request->authorizeCard = '5105004199408240010';
+//        $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要
+//        $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 签约时短信验证需要
 
         if (isset($data['master_email'])) {
             $request->emailOrMobile = $data['master_email']; //邮箱
@@ -105,8 +102,8 @@ class JunziqianController extends BaseApiController
         $request->organizationRegNo = $data['organization_code'];
         $request->organizationRegImg = $data['business_license']; //new CURLFile('D:/tmp/test.png',null,"test.png");
         $request->legalName = $data["master_name"]; //法人
-        $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要
-        $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 短信验证需要
+//        $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要
+//        $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 短信验证需要
         $request->emailOrMobile = $data['master_email']; //邮箱
         //发起创建企业请求
         $response = $requestUtils->doPost("/v2/user/organizationReapply", $request);
@@ -178,11 +175,6 @@ class JunziqianController extends BaseApiController
         $request-> legalMobile = $data['master_phone'];
         $request-> faceAgantIdenName = $data['master_name'];
         $request-> faceAgantIdenCard = $data['master_id_card'];
-
-        $request-> facePerType = 1;
-        $request-> faceAgantIdenName = '马开明';
-        $request-> faceAgantIdenCard = '5105004199408240010';
-
         $request-> backUrl = env('url.url_prefix').'/api/Hetong/notifyOrganizationFaceCreate';
         $response = $requestUtils->doPost("/v2/user/organizationFaceCreate",$request);
         return $response;

From 5a936741dc7e6674ce6d73f81130abbb05e25055 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 21:20:13 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 04b15483f..f4c411299 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -241,7 +241,7 @@ class CompanyController extends BaseAdminController
             ];
             $res = app(JunziqianController::class)->organizationReapply($data);
             if ($res->success == true) {
-                Db::name('company')->where('id', $params['id'])->update(['master_email' => $res->data]);
+                Db::name('company')->where('id', $params['id'])->update(['master_email' => $res->data, 'face_create_status'=>1]); //todo 上人脸采集功能时
                 return $this->success('系统认证中，请稍后刷新页面查看', ['email' => $res->data], 1, 1);
             } else {
                 return $this->fail($res->msg);

From 460b2fd29cc324bd76663f670eccd3f0eb40cb70 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 21:21:22 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/validate/CompanyValidate.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/validate/CompanyValidate.php b/app/adminapi/validate/CompanyValidate.php
index 45b96bd90..784348016 100644
--- a/app/adminapi/validate/CompanyValidate.php
+++ b/app/adminapi/validate/CompanyValidate.php
@@ -35,7 +35,7 @@ class CompanyValidate extends BaseValidate
         'company_name' => 'require|unique:Company',
         'organization_code' => 'require',
         'master_name' => 'require',
-        'id_card' => 'require',
+//        'id_card' => 'require',
         'master_position' => 'require',
         'master_phone' => 'require',
         'master_email' => 'require',
@@ -53,7 +53,7 @@ class CompanyValidate extends BaseValidate
         'company_name' => '公司名称',
         'organization_code' => '组织机构代码',
         'master_name' => '主联系人姓名',
-        'id_card' => '主联系人身份证',
+//        'id_card' => '主联系人身份证',
         'master_position' => '主联系人职务',
         'master_phone' => '主联系人手机',
         'master_email' => '主联系人邮箱',
@@ -70,7 +70,7 @@ class CompanyValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['company_name','organization_code','master_name','id_card','master_position','master_phone']);
+        return $this->only(['company_name','organization_code','master_name','master_position','master_phone']);
     }
 
 
@@ -82,7 +82,7 @@ class CompanyValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','company_name','organization_code','master_name','id_card','master_position','master_phone']);
+        return $this->only(['id','company_name','organization_code','master_name','master_position','master_phone']);
     }
 
 

From dd8e07a5a47c736e346a28b2be8551940dd28e9d Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 21:24:15 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index f4c411299..a2ea97426 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -211,7 +211,7 @@ class CompanyController extends BaseAdminController
 //                    return $this->fail($faceCreateRe);
 //                }
                 // 修改法人邮箱
-                Db::name('company')->where('id', $params['id'])->update(['master_email' => $email]);
+                Db::name('company')->where('id', $params['id'])->update(['master_email' => $email, 'face_create_status'=>1]);
                 // 加入缓存中，is_callback用于判断是否获取到异步通知
                 RedisLogic::getInstance()->set('authentication_company_id_'.$company['id'], json_encode(['company_id'=>$company['id'],'is_callback'=>0, 'timing'=>time()]));
 //                return $this->success('认证成功',[],1, 1);

From ce44bef03db92bab3470707f2887b3b168e0a07d Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 9 Sep 2023 09:09:06 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=AD=BE=E7=BA=A6?=
 =?UTF-8?q?=E6=97=B6=E9=9C=80=E8=A6=81=E4=BA=BA=E8=84=B8=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/JunziqianController.php  | 2 +-
 app/common/logic/contract/ContractLogic.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index 25e8bfd90..cb5c2b614 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -148,7 +148,7 @@ class JunziqianController extends BaseApiController
         $request = new ApplySignReq();
         $request->contractName = $data['name'];
         $request->signatories = $data['signatories']; //签约方
-        $request->faceThreshold = 79; // 人脸识别阀值:默认等级(1-100之间整数)，建议范围(60-79)
+//        $request->faceThreshold = 79; // 人脸识别阀值:默认等级(1-100之间整数)，建议范围(60-79)
         $request->serverCa = 1; //是否需要服务端云证书
         $request->fileType = 1; //合同上传方式 url
         $request->url = $data['url'];
diff --git a/app/common/logic/contract/ContractLogic.php b/app/common/logic/contract/ContractLogic.php
index 64de58c32..f365cc44e 100644
--- a/app/common/logic/contract/ContractLogic.php
+++ b/app/common/logic/contract/ContractLogic.php
@@ -261,8 +261,8 @@ class ContractLogic extends BaseLogic
                 $data = [
                     'name' => $name . '的合同',
                     'signatories' => [
-                        ['fullName' => $name, 'identityType' => 12, 'identityCard' => $result['organization_code'], 'email' => $result['master_email'],  'noNeedVerify' => 1, 'authLevel'=>[11],'signLevel' => 1],
-                        ['fullName' => $result['contract']['party_a_info']['company_name'], 'identityType' => 12, 'identityCard' => $result['contract']['party_a_info']['organization_code'], 'email' => $result['contract']['party_a_info']['master_email'], 'noNeedVerify' => 1, 'authLevel'=>[11],'signLevel' => 1]
+                        ['fullName' => $name, 'identityType' => 12, 'identityCard' => $result['organization_code'], 'email' => $result['master_email'],  'noNeedVerify' => 1, 'signLevel' => 1], // 'authLevel'=>[11], 签约时验证人脸识别
+                        ['fullName' => $result['contract']['party_a_info']['company_name'], 'identityType' => 12, 'identityCard' => $result['contract']['party_a_info']['organization_code'], 'email' => $result['contract']['party_a_info']['master_email'], 'noNeedVerify' => 1, 'signLevel' => 1]
                     ],
                     'url' => $result['contract']['file'],
                 ];

From ca645a26fab56cef9893ca57352c1f19722328f0 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sat, 9 Sep 2023 09:31:26 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=87=BA=E7=8E=B0Attempt=20to=20rea?=
 =?UTF-8?q?d=20property=20"area=5Fmanager"=20on=20null=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/contract/ContractLists.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php
index cebad313d..34ab1bfd7 100644
--- a/app/adminapi/lists/contract/ContractLists.php
+++ b/app/adminapi/lists/contract/ContractLists.php
@@ -90,9 +90,13 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
                 }else{
                     $item->party_b_name=Db::name('user')->where('id',$item->party_b)->value('nickname');
                 }
-                $area_manager_name=Db::name('admin')->where('id',$item->party_a_info->area_manager)->value('name');
-                if($area_manager_name){
-                    $item->area_manager_name=$area_manager_name;
+                if(!empty($item->party_a_info)){
+                    $area_manager_name=Db::name('admin')->where('id',$item->party_a_info->area_manager)->value('name');
+                    if($area_manager_name){
+                        $item->area_manager_name=$area_manager_name;
+                    }else{
+                        $item->area_manager_name='暂无片区经理';
+                    }
                 }else{
                     $item->area_manager_name='暂无片区经理';
                 }