|
|
@@ -180,7 +180,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
BeanUtil.copyProperties(user, userWhoami);
|
|
|
|
|
|
UserBindDetail bindPhone = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
|
|
|
- .eq(UserBindDetail::getUserId, userId).last("limit 1"));
|
|
|
+ .eq(StrUtil.isNotEmpty(user.getOpenId()), UserBindDetail::getUserId, userId)
|
|
|
+ .eq(StrUtil.isNotEmpty(user.getEmail()), UserBindDetail::getEmailUserId, userId).last("limit 1"));
|
|
|
//手机号
|
|
|
if (bindPhone != null) {
|
|
|
userWhoami.setBindPhone(bindPhone.getPhone());
|