Merge branch 'information-27' into dev

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -224,16 +224,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 	    }
 	    BeanUtil.copyProperties(user, userWhoami);
 
-	    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());
-		    }
-	    }
+		UserBindDetail bindPhone = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
+				.eq(StrUtil.isNotEmpty(user.getOpenId()), UserBindDetail::getUserId, userId)
+				.eq(StrUtil.isNotBlank(user.getLoginPhone()), UserBindDetail::getPhoneUserId, 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())) {
 		    type = 1;