Browse Source

找回密码

huangxingxing 2 years ago
parent
commit
a31a094d05

+ 5 - 5
generated/com/miniframe/generate/comm/system/A_B00026.java

@@ -22,18 +22,18 @@ public class A_B00026 extends BaseMapModel implements Serializable {
 	public String getNewPassword() {
 		return this.newPassword;
 	}
-	String mail;//邮箱
+	String mailOrPhone;//邮箱
 	/**
 	 *邮箱
 	 */
-	public void setMail(String mail) {
-		this.mail=mail;
+	public void setMailOrPhone(String mailOrPhone) {
+		this.mailOrPhone=mailOrPhone;
 	}
 	/**
 	 *邮箱
 	 */
-	public String getMail() {
-		return this.mail;
+	public String getMailOrPhone() {
+		return this.mailOrPhone;
 	}
 	String verificationCode;//验证码
 	/**

+ 2 - 2
generated/validateform/a_b00026Form.xml

@@ -17,8 +17,8 @@
       <var-value>256</var-value>
     </var>
 </field>
-<field property="mail" depends="required,minlength,maxlength">
-    <arg0 key="a_b00026.mail"/>
+<field property="mailOrPhone" depends="required,minlength,maxlength">
+    <arg0 key="a_b00026.mailOrPhone"/>
     <arg1 name="minlength" key="${var:minlength}"/>
     <var>
       <var-name>minlength</var-name>

+ 1 - 1
generated/validator/resources_a_b00026Form_validator.properties

@@ -1,4 +1,4 @@
 a_b00026.newPassword = \u5BC6\u7801
-a_b00026.mail = \u90AE\u7BB1
+a_b00026.mailOrPhone = \u90AE\u7BB1
 a_b00026.verificationCode = \u9A8C\u8BC1\u7801
 a_b00026Form = true

+ 1 - 1
generated/validator/resources_a_b00026Form_validator_zh_CN.properties

@@ -1,4 +1,4 @@
 a_b00026.newPassword = \u5BC6\u7801
-a_b00026.mail = \u90AE\u7BB1
+a_b00026.mailOrPhone = \u90AE\u7BB1
 a_b00026.verificationCode = \u9A8C\u8BC1\u7801
 a_b00026Form = true

+ 10 - 3
src/main/java/com/miniframe/bisiness/system/B00026Service.java

@@ -29,7 +29,8 @@ public class B00026Service extends B00026BaseModel implements ExecProcessFlow {
     public void transExecute() throws Exception {
 
         // 验证短信验证码
-        boolean verification = IdentifyingCodeUtil.verification(this.getA_b00026().getMail(), this.getA_b00026().getVerificationCode());
+        boolean verification = IdentifyingCodeUtil.verification(this.getA_b00026().getMailOrPhone(),
+                this.getA_b00026().getVerificationCode());
         if (!verification) {
             // 验证码校验失败!
             throw new BusinessException("EB8000021");
@@ -39,10 +40,16 @@ public class B00026Service extends B00026BaseModel implements ExecProcessFlow {
         ;
         SysUserSQLBuilder sb = new SysUserSQLBuilder();
         // 找回密码
-        sb.createCriteria().andUseremailEqualTo(this.getA_b00026().getMail());
+        sb.createCriteria().andUseremailEqualTo(this.getA_b00026().getMailOrPhone());
+
         List<SysUser> sysUsers = dao.selectByExample(sb);
         if (CollectionUtils.isEmpty(sysUsers)) {
-            throw new BusinessException("EB8000029");
+            sb.clear();
+            sb.createCriteria().andUsermobnubEqualTo(this.getA_b00026().getMailOrPhone());
+            sysUsers = dao.selectByExample(sb);
+            if (CollectionUtils.isEmpty(sysUsers)) {
+                throw new BusinessException("EB8000029");
+            }
         }
 
         SysUser user = new SysUser();

+ 1 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/B00026_A(找回密码).csv

@@ -1,4 +1,4 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,newPassword,密码,string,,,是,1,256,,,,,,
-2,mail,邮箱,string,,,是,1,512,,,,,,
+2,mailOrPhone,邮箱,string,,,是,1,512,,,,,,
 3,verificationCode,验证码,string,,,是,1,32,,,,,,