修复注册不成功的问题

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

@@ -60,11 +60,6 @@ public class SysRegisterService {
 
         if (StringUtils.isEmpty(username)) {
             msg = "用户名不能为空";
-        } else if (!StringUtils.isEmpty(username)) {
-            boolean result = checkPhoneNumber(username);
-            if (!result) {
-                msg = "请用手机号进行注册!";
-            }
         } else if (StringUtils.isEmpty(password)) {
             msg = "用户密码不能为空";
         } else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
@@ -76,13 +71,18 @@ public class SysRegisterService {
         } else if (!userService.checkUserNameUnique(sysUser)) {
             msg = "保存用户'" + username + "'失败，注册账号已存在";
         } else {
-            sysUser.setNickName(username + RandomUtils.nextInt(100000, 999999));
-            sysUser.setPassword(SecurityUtils.encryptPassword(password));
-            boolean regFlag = userService.registerUser(sysUser);
-            if (!regFlag) {
-                msg = "注册失败,请联系系统管理人员";
+            boolean result = checkPhoneNumber(username);
+            if (!result) {
+                msg = "请用手机号进行注册!";
             } else {
-                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success")));
+                sysUser.setNickName(username + RandomUtils.nextInt(100000, 999999));
+                sysUser.setPassword(SecurityUtils.encryptPassword(password));
+                boolean regFlag = userService.registerUser(sysUser);
+                if (!regFlag) {
+                    msg = "注册失败,请联系系统管理人员";
+                } else {
+                    AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success")));
+                }
             }
         }