|
|
@@ -179,13 +179,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
}
|
|
|
BeanUtil.copyProperties(user, userWhoami);
|
|
|
|
|
|
- UserBindDetail bindPhone = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
|
|
|
- .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());
|
|
|
- userWhoami.setBindEmail(bindPhone.getEmail());
|
|
|
+ if (StrUtil.isEmpty(user.getLoginPhone())) {
|
|
|
+ UserBindDetail bindPhone = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
|
|
|
+ .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());
|
|
|
+ userWhoami.setBindEmail(bindPhone.getEmail());
|
|
|
+ }
|
|
|
}
|
|
|
Integer type = 3;
|
|
|
if (StrUtil.isNotBlank(user.getLoginPhone())) {
|