wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~

main
linhw 2024-06-24 11:19:00 +08:00
parent 2e09d39736
commit 84cd2b937e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,10 +148,11 @@ public class AppLoginController {
switch (register.getStatus()) { switch (register.getStatus()) {
case 0: case 0:
return R.fail(201, "请等待，您的账号正在审核中！"); return R.fail(201, "请等待，您的账号正在审核中！");
case 1: case 1:
return R.ok(null, "您的账号已通过"); return R.ok(null, "您的账号已通过");
case 2: case 2:
appRegisterService.updateAppRegisterByPhone(register); appRegisterService.updateAppRegisterByPhone(register);
return R.fail(201, "您的审核已被拒绝，请检查资料再次提交！");
} }
} else { } else {
return R.fail(201, "手机号未注册！"); return R.fail(201, "手机号未注册！");

4
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
View File

@ -36,12 +36,12 @@ public class PhoneCodeController {
if (type == 1) { if (type == 1) {
AppRegister appRegister = appRegisterService.selectAppRegisterByphone(phoneNum); AppRegister appRegister = appRegisterService.selectAppRegisterByphone(phoneNum);
if (appRegister != null && appRegister.getStatus() == 0) { /*if (appRegister != null && appRegister.getStatus() == 0) {
return AjaxResult.error(201, "请等待，您的账号正在审核中！"); return AjaxResult.error(201, "请等待，您的账号正在审核中！");
} }
if (appRegister != null && appRegister.getStatus() == 2) { if (appRegister != null && appRegister.getStatus() == 2) {
return AjaxResult.error(201, "您的账号申请被驳回"); return AjaxResult.error(201, "您的账号申请被驳回");
} }*/
send = sendNoteUtil.sendNoteMessgae(phoneNum); send = sendNoteUtil.sendNoteMessgae(phoneNum);
}else { }else {
send = sendNoteUtil.sendNoteMessgae(phoneNum); send = sendNoteUtil.sendNoteMessgae(phoneNum);

1
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSchoolMapper.xml
View File

@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectAppSchoolVo"/> <include refid="selectAppSchoolVo"/>
<where> <where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <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> </where>
</select> </select>