From 853be4941977acca0af29e878c825e16005d9427 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Tue, 3 Sep 2024 17:19:21 +0800
Subject: [PATCH] ~

---
 .../com/ruoyi/app/controller/AppLoginController.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
index 93b4d0b..928a0bf 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
@@ -99,7 +99,11 @@ public class AppLoginController {
         ) {
             return R.fail(2001,"请填写邮件地址或上传学校证明！");
         }
-
+        String phone = redisService.getCacheObject("key" + registerForm.getPhoneNumber());
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(phone)) {
+            redisService.deleteObject(registerForm.getPhoneNumber());
+            registerForm.setPhoneNumber(phone);
+        }
         String email = registerForm.getEmail();
         if (org.apache.commons.lang3.StringUtils.isNotBlank(email)) {
             if (email.indexOf("@") == -1) {
@@ -113,11 +117,6 @@ public class AppLoginController {
             if (org.apache.commons.lang3.StringUtils.isBlank(registerForm.getProve()) && !emailStr.equals(appSchool.getEmail())) {
                 return R.fail(2001,"您提供的邮箱后缀与您的学校不符！请提供学习邮箱或人工审核。");
             }
-            String phone = redisService.getCacheObject("key" + registerForm.getPhoneNumber());
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(phone)) {
-                redisService.deleteObject(registerForm.getPhoneNumber());
-                registerForm.setPhoneNumber(phone);
-            }
             AppRegister appRegister = setAppRegister(registerForm);
             //校验邮箱是否已注册
             AppUser emailUser = appUserService.selectAppUserByEmail(registerForm.getEmail());