~

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java

@@ -152,6 +152,7 @@ public class AppLoginController {
                         return R.ok(null, "您的账号已通过");
                     case 2:
                         appRegisterService.updateAppRegisterByPhone(register);
+                        return R.fail(201, "您的审核已被拒绝，请检查资料再次提交！");
                 }
             } else {
                 return R.fail(201, "手机号未注册！");

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);

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>