From b7d6b0ed8d87a5a318c0d8f07fa244076a031be0 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 3 Dec 2020 11:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=97=B6=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/app/controller/Auth.php | 40 +++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/hyhproject/app/controller/Auth.php b/hyhproject/app/controller/Auth.php
index 50cbece..a183b6b 100755
--- a/hyhproject/app/controller/Auth.php
+++ b/hyhproject/app/controller/Auth.php
@@ -104,18 +104,6 @@ class Auth extends Base{
             }
             //$loginName = WSTRandomLoginName($log
 			$data['status'] = 0;
-            $apm = new M();
-            $apm->setTable('auth_personal');
-            try{
-                if ($m->where('householdIdCard', '=', $data['householdIdCard'])->count()>0) {
-                    exit(jsonReturn('友情提示：您好：已有同身份证号用户注册我商城，请联系您的家人查询“用户名”和相关密码。'));
-                }
-                if ($m->where('householdName', '=', $data['householdName'])->count()>0) {
-                    exit(jsonReturn('友情提示：您好：已有同姓名注册我商城，请联系您的家人查询“用户名”和相关密码。'));
-                }
-            } catch (\Exception $e) {
-                errLog($e);
-            }
 		}
 		
 		unset($data['authId']);
@@ -123,8 +111,36 @@ class Auth extends Base{
 		unset($data['isCompany']);	
 		unset($data['payPwd']);	
 		if($isUpdate){
+		    if (isset($data['householdIdCard']) && isset($data['householdName'])) {
+                try{
+                    $apm = new M();
+                    $apm->setTable('auth_personal');
+                    if ($m->where('id', '<>', $authId)->where('householdIdCard', '=', $data['householdIdCard'])->count()>0) {
+                        exit(jsonReturn('友情提示：您好：已有同身份证号用户注册我商城，请联系您的家人查询“用户名”和相关密码。'));
+                    }
+                    if ($m->where('id', '<>', $authId)->where('householdName', '=', $data['householdName'])->count()>0) {
+                        exit(jsonReturn('友情提示：您好：已有同姓名注册我商城，请联系您的家人查询“用户名”和相关密码。'));
+                    }
+                } catch (\Exception $e) {
+                    errLog($e);
+                }
+            }
 			$isSuccess = $m->updateInfo(['id'=>$authId],$data);
 		}else{
+            if (isset($data['householdIdCard']) && isset($data['householdName'])) {
+                try{
+                    $apm = new M();
+                    $apm->setTable('auth_personal');
+                    if ($m->where('householdIdCard', '=', $data['householdIdCard'])->count()>0) {
+                        exit(jsonReturn('友情提示：您好：已有同身份证号用户注册我商城，请联系您的家人查询“用户名”和相关密码。'));
+                    }
+                    if ($m->where('householdName', '=', $data['householdName'])->count()>0) {
+                        exit(jsonReturn('友情提示：您好：已有同姓名注册我商城，请联系您的家人查询“用户名”和相关密码。'));
+                    }
+                } catch (\Exception $e) {
+                    errLog($e);
+                }
+            }
 			$isSuccess = $m->insertInfo($data);
 		}		
 		if(false !== $isSuccess){