From d2b286e352d289d256697b5cc55f3fa352fc7985 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Sep 2023 16:50:39 +0800
Subject: [PATCH] update

---
 app/common/logic/CompanyLogic.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php
index d5d7050c4..6faabc6ba 100644
--- a/app/common/logic/CompanyLogic.php
+++ b/app/common/logic/CompanyLogic.php
@@ -57,12 +57,12 @@ class CompanyLogic extends BaseLogic
             // }
 
             // 手机号不能重复
-            $companyInfo = Company::where(['master_phone'=>$params['master_phone']])->find();
+            $companyInfo = Company::where(['master_phone'=>$params['master_phone']])->whereNull('delete_time')->find();
             if (!empty($companyInfo)) {
                 throw new Exception('手机号已存在');
             }
             // 社会统一信用代码不能重复
-            $companyInfo = Company::where(['organization_code'=>$params['organization_code']])->find();
+            $companyInfo = Company::where(['organization_code'=>$params['organization_code']])->whereNull('delete_time')->find();
             if (!empty($companyInfo)) {
                 throw new Exception('社会代码已存在');
             }
@@ -212,14 +212,14 @@ class CompanyLogic extends BaseLogic
         Db::startTrans();
         try {
             // 手机号不能重复
-            $companyInfo = Company::where(['master_phone'=>$params['master_phone']])->where('id','<>',$params['id'])->find();
+            $companyInfo = Company::where(['master_phone'=>$params['master_phone']])->where('id','<>',$params['id'])->whereNull('delete_time')->find();
             if (!empty($companyInfo)) {
                 Db::rollback();
                 throw new Exception('手机号已存在');
             }
 
             // 社会代码不能重复
-            $companyInfo = Company::where(['organization_code'=>$params['organization_code']])->where('id','<>',$params['id'])->find();
+            $companyInfo = Company::where(['organization_code'=>$params['organization_code']])->where('id','<>',$params['id'])->whereNull('delete_time')->find();
             if (!empty($companyInfo)) {
                 Db::rollback();
                 throw new Exception('社会代码已存在');