diff --git a/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java b/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java
index 0c7b9dc90..db887b39a 100644
--- a/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java
+++ b/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java
@@ -141,7 +141,7 @@ public class EmailService extends BaseService {
         }
     }
 
-    private boolean isValidEmail(String email) {
+    public boolean isValidEmail(String email) {
         return !StringUtils.isEmpty(email) && email.matches(EMAIL_REGEX);
     }
 }
diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java
index 78476c206..6a213bccf 100644
--- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java
+++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java
@@ -145,7 +145,8 @@ public class AccountManageService {
             Account account = null;
             String thirdAccountEmail = null;
 
-            if (LoginTypeEnum.GOOGLE.getValue() == type) {
+            // openid是邮箱，则是新版本
+            if (LoginTypeEnum.GOOGLE.getValue() == type && emailService.isValidEmail(openid)) {
                 GoogleOpenidRef ref = googleOpenidRefService.getRefByEmail(openid, idToken);
                 if (null != ref) {
                     openid = ref.getOpenId();