diff --git a/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyTelephoneInterceptor.java b/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyTelephoneInterceptor.java index 8b8e330e..cb146c8f 100644 --- a/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyTelephoneInterceptor.java +++ b/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyTelephoneInterceptor.java @@ -6,6 +6,7 @@ import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; import org.apache.commons.lang3.StringUtils; + @SuppressWarnings("unchecked") public class VerifyTelephoneInterceptor implements Interceptor { @Override @@ -26,7 +27,7 @@ public class VerifyTelephoneInterceptor implements Interceptor { } String telephone = con.getPara("telephone"); String personId = con.getPara("person_id"); - LoginPersonModel loginModel=new LoginPersonModel(); + LoginPersonModel loginModel = new LoginPersonModel(); if (StringUtils.isBlank(telephone)) { inv.invoke(); } else { @@ -34,21 +35,17 @@ public class VerifyTelephoneInterceptor implements Interceptor { con.renderJson(CommonUtil.returnMessageJson(false, "手机号格式不正确!")); return; } else { - int telephoneRes; + boolean telephoneRes; if (personId == null) { telephoneRes = loginModel.getTelephoneIsExist(telephone); } else { telephoneRes = loginModel.getTelephoneIsExist(telephone, personId); } - if (telephoneRes == 0) { + if (!telephoneRes) { inv.invoke(); - } else if (telephoneRes == 1) { - con.renderJson(CommonUtil.returnMessageJson(false, "手机号已存在")); - return; } else { - con.renderJson(CommonUtil.returnMessageJson(false, "操作异常!")); - return; + con.renderJson(CommonUtil.returnMessageJson(false, "手机号已存在")); } } } diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java index d9bf9476..24420ff5 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java @@ -147,10 +147,10 @@ public class LoginPersonModel { * @param telephone 手机号 * @return 0:不存在 1:已存在 2:异常 */ - public int getTelephoneIsExist(String telephone) { + public boolean getTelephoneIsExist(String telephone) { String sql = Db.getSql("loginPerson.getTelephoneIsExist"); Record record = Db.findFirst(sql, telephone); - return record == null ? 2 : 1; + return record != null; } /** @@ -161,10 +161,10 @@ public class LoginPersonModel { * @param telephone * @return 0:不存在 1:已存在 2:异常 */ - public int getTelephoneIsExist(String telephone, String person_id) { + public boolean getTelephoneIsExist(String telephone, String person_id) { String sql = Db.getSql("loginPerson.getTelephoneIsExistByPersonId"); Record record = Db.findFirst(sql, telephone, person_id); - return record == null ? 2 : 1; + return record != null; } /**