From 76dc81f9b75c90d86e6e28a09827adf8e2d38ca6 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 16:38:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=92=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E6=97=B6=EF=BC=8C=E7=A4=BE=E4=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/HetongController.php |  2 +-
 app/common/logic/CompanyLogic.php       | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/HetongController.php b/app/api/controller/HetongController.php
index c3a12a645..074322b5a 100644
--- a/app/api/controller/HetongController.php
+++ b/app/api/controller/HetongController.php
@@ -82,7 +82,7 @@ class HetongController extends BaseApiController
         $msg = '人脸采集成功';
         if (isset($result['status']) &&  $result['status'] == 1) {
             // 修改人脸采集状态
-            Company::where(['id'=>$result['orderNo']])->update(['face_create_status'=>1]);
+            Company::where(['organization_code'=>$result['organizationRegNo']])->update(['face_create_status'=>1]);
         } else {
             $msg = '采集失败，原因：'.$result['msg'];
             // 记录错误日志
diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php
index c46818541..d5d7050c4 100644
--- a/app/common/logic/CompanyLogic.php
+++ b/app/common/logic/CompanyLogic.php
@@ -61,6 +61,11 @@ class CompanyLogic extends BaseLogic
             if (!empty($companyInfo)) {
                 throw new Exception('手机号已存在');
             }
+            // 社会统一信用代码不能重复
+            $companyInfo = Company::where(['organization_code'=>$params['organization_code']])->find();
+            if (!empty($companyInfo)) {
+                throw new Exception('社会代码已存在');
+            }
             $arr=[
                 'company_name' => $params['company_name'],
                 'organization_code' => $params['organization_code'],
@@ -212,6 +217,14 @@ class CompanyLogic extends BaseLogic
                 Db::rollback();
                 throw new Exception('手机号已存在');
             }
+
+            // 社会代码不能重复
+            $companyInfo = Company::where(['organization_code'=>$params['organization_code']])->where('id','<>',$params['id'])->find();
+            if (!empty($companyInfo)) {
+                Db::rollback();
+                throw new Exception('社会代码已存在');
+            }
+
             $arr=[
                 'company_name' => $params['company_name'],
                 'organization_code' => $params['organization_code'],