From 84cd2b937ef02161fddff9cb1590b596cd25ec33 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Mon, 24 Jun 2024 11:19:00 +0800
Subject: [PATCH] ~

---
 .../java/com/ruoyi/app/controller/AppLoginController.java     | 3 ++-
 .../java/com/ruoyi/app/controller/PhoneCodeController.java    | 4 ++--
 .../src/main/resources/mapper/app/AppSchoolMapper.xml         | 1 +
 3 files changed, 5 insertions(+), 3 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 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"
         <include refid="selectAppSchoolVo"/>
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="email != null  and email != ''"> and email like concat('%', #{email}, '%')</if>
         </where>
     </select>