From 6638a77051f3f5404bc344fda384e87ade86a7c4 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 21 Mar 2023 13:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/model/member/Login.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/model/member/Login.php b/app/model/member/Login.php
index 7ab0369a..14d55822 100644
--- a/app/model/member/Login.php
+++ b/app/model/member/Login.php
@@ -129,12 +129,14 @@ class Login extends BaseModel{
 
     // 承诺登录（需要同意承诺书后方可登录）
     public function promiseLogin($data){
+        $data['wx_unionid'] = $data['wx_unionid'] ?? '';
         // 获取用户信息
         $info = (array)Db::name('member')
             ->field('member_id,username, nickname, mobile, email, status, last_login_time, can_receive_registergift')
             ->where(function($query) use ($data){
-                $query->where('weapp_openid',$data['weapp_openid'])
-                    ->whereOr('wx_unionid',$data['wx_unionid'] ?? '');
+                if($data['weapp_openid'] && $data['wx_unionid']) $query->where('weapp_openid',$data['weapp_openid'])->whereOr('wx_unionid',$data['wx_unionid']);
+                else if($data['weapp_openid']) $query->where('weapp_openid',$data['weapp_openid']);
+                else if($data['wx_unionid']) $query->where('wx_unionid',$data['wx_unionid']);
             })
             ->where('site_id',$data['site_id'])
             ->where('is_delete',0)