LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 41192 下载模板--用户导入模板文件，’手机号‘字段与页面不一致

Browse Source
This commit is contained in:
lijiarao
2021-10-21 15:22:25 +08:00
parent 4373d27daf
commit f098ef3c54
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+1 -1
View File
@@ -789,7 +789,7 @@ public class SysUserController {
wrapper1.eq(SysUser::getDelFlag,0); wrapper1.eq(SysUser::getDelFlag,0);
if (sysUserService.count(wrapper1)>0) { if (sysUserService.count(wrapper1)>0) {
errorLines++; errorLines++;
errorMessage.add("第 " + lineNumber + " 行：手机号已经存在"); errorMessage.add("第 " + lineNumber + " 行：手机号码已经存在");
} }
LambdaQueryWrapper<SysUser> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(SysUser::getEmail,sysUser.getEmail()); wrapper2.eq(SysUser::getEmail,sysUser.getEmail());
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+2 -2
View File
@@ -99,8 +99,8 @@ public class SysUser implements Serializable {
/** /**
* 电话 * 电话
*/ */
@Excel(name = "手机号", width = 15) @Excel(name = "手机号码", width = 15)
@NotBlank(message = "手机号不能为空") @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 = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
private String phone; private String phone;
jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class SysUserTemplate {
/** /**
* 电话 * 电话
*/ */
@Excel(name = "手机号", width = 15) @Excel(name = "手机号码", width = 15)
@NotBlank(message = "手机号不能为空！") @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 = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
private String phone; private String phone;