diff --git a/src/main/java/com/huoran/iasf/service/impl/UserServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/UserServiceImpl.java index 1667e57..c4d9bb4 100644 --- a/src/main/java/com/huoran/iasf/service/impl/UserServiceImpl.java +++ b/src/main/java/com/huoran/iasf/service/impl/UserServiceImpl.java @@ -376,7 +376,7 @@ public class UserServiceImpl extends ServiceImpl impleme //检验姓名 if ("".equals(realName)) { ++countNum; - vo1.setUserName(realName + " *必填项:(姓名不能为空) "); + vo1.setRealName(realName + " *必填项:(姓名不能为空) "); errMsg += countNum + "必填项:(姓名不能为空)"; ret = false; } else { @@ -403,7 +403,7 @@ public class UserServiceImpl extends ServiceImpl impleme ret = false; } } else { - vo1.setUserName(username + ""); + vo1.setUserName(username); } } diff --git a/src/main/java/com/huoran/iasf/vo/ImportUserFailureVo.java b/src/main/java/com/huoran/iasf/vo/ImportUserFailureVo.java index a92fa7f..380c2ef 100644 --- a/src/main/java/com/huoran/iasf/vo/ImportUserFailureVo.java +++ b/src/main/java/com/huoran/iasf/vo/ImportUserFailureVo.java @@ -17,12 +17,12 @@ public class ImportUserFailureVo { //第几行 private Long index; - @Excel(name = "姓名", orderNum = "1", isImportField = "id", width = 30) + @Excel(name = "姓名", orderNum = "1", isImportField = "realName", width = 30) @ApiModelProperty(value = "姓名") private String realName; @ApiModelProperty(value = "账号") - @Excel(name = "账号", orderNum = "2", mergeVertical = false, isImportField = "account", width = 30) + @Excel(name = "账号", orderNum = "2", isImportField = "userName", width = 30) private String userName; @ApiModelProperty(value = "角色") @@ -30,7 +30,7 @@ public class ImportUserFailureVo { private String roleName; @ApiModelProperty(value = "工号") - @Excel(name = "工号", orderNum = "4", isImportField = "workNumber", width = 30) + @Excel(name = "工号", orderNum = "4", isImportField = "jobNumber", width = 30) private String jobNumber; @ApiModelProperty(value = "所在部门")