diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index 41205abd..06d28c0c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.jero.common.aspect.annotation.Dict; +import com.jero.common.util.superSearch.ConstantUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -78,7 +79,7 @@ public class PayContactsManagement implements Serializable { @Excel(name = "手机号", width = 15) @ApiModelProperty(value = "手机号") @NotEmpty(message = "手机号不能为空") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号格式错误") private String phone; /**邮箱*/ @Excel(name = "邮箱", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java index fe67691f..0a3d689e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java @@ -2,6 +2,7 @@ package com.jero.company.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonProperty; +import com.jero.common.util.superSearch.ConstantUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -19,7 +20,7 @@ public class CompanyLoginVO { /**手机号*/ @ApiModelProperty(value = "手机号") @NotEmpty(message = "手机号不能为空!") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误") private String phone; /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/pay/company/entity/PayContactsManagement.java b/jero-boot-module-system/src/main/java/com/jero/modules/pay/company/entity/PayContactsManagement.java index 79576120..00018e30 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/pay/company/entity/PayContactsManagement.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/pay/company/entity/PayContactsManagement.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonProperty; import com.jero.common.aspect.annotation.Dict; +import com.jero.common.util.superSearch.ConstantUtils; import com.jero.modules.system.volid.group.CreateGroup; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; @@ -66,7 +67,7 @@ public class PayContactsManagement implements Serializable { @Excel(name = "手机号", width = 15) @ApiModelProperty(value = "手机号") @NotEmpty(message = "手机号不能为空!") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE ,message = "手机号码格式错误") private String phone; /**邮箱*/ @Excel(name = "邮箱", width = 15) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java index f093469b..45ca91f6 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.util.superSearch.ConstantUtils; import lombok.Data; import com.jero.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; @@ -61,7 +62,7 @@ public class SysDepart implements Serializable { private String orgCode; /**手机号*/ @Excel(name="手机号",width=15,orderNum = "5") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误") private String mobile; /**传真*/ private String fax; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index 41341382..19ce51c5 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.jero.common.aspect.annotation.Dict; import com.jero.common.util.PasswordUtil; +import com.jero.common.util.superSearch.ConstantUtils; import com.jero.modules.system.volid.group.CreateGroup; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; @@ -101,7 +102,7 @@ public class SysUser implements Serializable { */ @Excel(name = "手机号码", width = 15) @NotBlank(message = "手机号码不能为空") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误") private String phone; /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java index 04e2fad9..2f619225 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java @@ -1,6 +1,7 @@ package com.jero.modules.system.model; import com.jero.common.aspect.annotation.Dict; +import com.jero.common.util.superSearch.ConstantUtils; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -39,7 +40,7 @@ public class SysDepartExcel { private String orgCode; /**手机号*/ @Excel(name="手机号",width=15,orderNum = "5") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号格式错误") private String mobile; /**传真*/ private String fax; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartImportExcel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartImportExcel.java index cd2ca4cc..4d011f0e 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartImportExcel.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartImportExcel.java @@ -1,6 +1,7 @@ package com.jero.modules.system.model; import com.jero.common.aspect.annotation.Dict; +import com.jero.common.util.superSearch.ConstantUtils; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -39,7 +40,7 @@ public class SysDepartImportExcel { private String orgCode; /**手机号*/ @Excel(name="手机号",width=15,orderNum = "5") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号格式错误") private String mobile; /**传真*/ private String fax; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginVO.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginVO.java index 9965b27e..2c01a04a 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginVO.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginVO.java @@ -1,6 +1,7 @@ package com.jero.modules.system.model; import com.fasterxml.jackson.annotation.JsonProperty; +import com.jero.common.util.superSearch.ConstantUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,7 +21,7 @@ public class SysLoginVO { /**手机号*/ @ApiModelProperty(value = "手机号") @NotEmpty(message = "手机号不能为空!") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误") private String phone; /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java index 9346715a..c379d89e 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java @@ -1,6 +1,7 @@ package com.jero.modules.system.vo; import com.jero.common.aspect.annotation.Dict; +import com.jero.common.util.superSearch.ConstantUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -34,7 +35,7 @@ public class SysUserTemplate { */ @Excel(name = "手机号码", width = 15) @NotBlank(message = "手机号不能为空!") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误") private String phone; /**