From bcf60b2b9b146937fe271dab7971a5f8cfb31875 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Tue, 25 Jun 2019 16:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vilson <545522390@qq.com>
---
 application/common/Model/Member.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/common/Model/Member.php b/application/common/Model/Member.php
index 5dd0a92..98069e7 100644
--- a/application/common/Model/Member.php
+++ b/application/common/Model/Member.php
@@ -137,8 +137,9 @@ class Member extends CommonModel
     {
         $currentMember = getCurrentMember();
         $where = ['code' => $currentMember['code']];
-        $currentMember = self::where($where)->find();
-
+        if ($currentMember) {
+            $currentMember = self::where($where)->find();
+        }
         $unionid = $userInfo['unionid'];
         $openid = $userInfo['openid'];
         $member = self::where(['dingtalk_unionid' => $unionid])->find();
@@ -163,7 +164,7 @@ class Member extends CommonModel
                 }
             }
         } else {
-            if ($member['dingtalk_unionid'] != $currentMember['dingtalk_unionid']) {
+            if ($currentMember && $member['dingtalk_unionid'] != $currentMember['dingtalk_unionid']) {
                 return error('1', '您想要绑定的第三方帐号已经被绑定给其他帐号，请先用该第三方帐号登录后，解绑释放它，再切回当前帐号发起绑定');
             }
         }