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 cdc8852..e74f5c2 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
@@ -148,10 +148,11 @@ public class AppLoginController {
switch (register.getStatus()) {
case 0:
return R.fail(201, "请等待,您的账号正在审核中!");
- case 1:
+ case 1:
return R.ok(null, "您的账号已通过");
case 2:
appRegisterService.updateAppRegisterByPhone(register);
+ return R.fail(201, "您的审核已被拒绝,请检查资料再次提交!");
}
} else {
return R.fail(201, "手机号未注册!");
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
index 9838a43..97178f5 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
@@ -36,12 +36,12 @@ public class PhoneCodeController {
if (type == 1) {
AppRegister appRegister = appRegisterService.selectAppRegisterByphone(phoneNum);
- if (appRegister != null && appRegister.getStatus() == 0) {
+ /*if (appRegister != null && appRegister.getStatus() == 0) {
return AjaxResult.error(201, "请等待,您的账号正在审核中!");
}
if (appRegister != null && appRegister.getStatus() == 2) {
return AjaxResult.error(201, "您的账号申请被驳回");
- }
+ }*/
send = sendNoteUtil.sendNoteMessgae(phoneNum);
}else {
send = sendNoteUtil.sendNoteMessgae(phoneNum);
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSchoolMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSchoolMapper.xml
index 52e2631..4259511 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSchoolMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSchoolMapper.xml
@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and name like concat('%', #{name}, '%')
+ and email like concat('%', #{email}, '%')