mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

问题修复

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-06-25 16:29:55 +08:00
parent 01b3be7406
commit bcf60b2b9b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/common/Model/Member.php
View File

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