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 e2b8833..c7f8a9e 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 @@ -140,9 +140,7 @@ public class AppLoginController { public R login(@RequestBody LoginForm loginForm) { AppUser appUser = appUserService.selectAppUserByPhone(loginForm.getPhoneNumber()); - if (appUser == null) { - Assert.isNull(appUser, "手机号未注册"); AppRegister register = appRegisterService.selectAppRegisterByphone(loginForm.getPhoneNumber()); if (register != null && register.getStatus() != null) { @@ -155,6 +153,8 @@ public class AppLoginController { case 2: appRegisterService.updateAppRegisterByPhone(register); } + } else { + return R.fail(201, "手机号未注册!"); } } else { Assert.notNull(appUser, "手机号未注册");