fix: 用户导入性别转换错误问题修复
This commit is contained in:
@@ -19,7 +19,7 @@ public class UserImportVO {
|
|||||||
private String nickname;
|
private String nickname;
|
||||||
|
|
||||||
@ExcelProperty(value = "性别")
|
@ExcelProperty(value = "性别")
|
||||||
private String gender;
|
private String genderLabel;
|
||||||
|
|
||||||
@ExcelProperty(value = "手机号码")
|
@ExcelProperty(value = "手机号码")
|
||||||
private String mobile;
|
private String mobile;
|
||||||
|
|||||||
@@ -107,13 +107,13 @@ public class UserImportListener extends MyAnalysisEventListener<UserImportVO> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (validationMsg.length() == 0) {
|
if (validationMsg.isEmpty()) {
|
||||||
// 校验通过,持久化至数据库
|
// 校验通过,持久化至数据库
|
||||||
SysUser entity = userConverter.importVo2Entity(userImportVO);
|
SysUser entity = userConverter.importVo2Entity(userImportVO);
|
||||||
entity.setDeptId(deptId); // 部门
|
entity.setDeptId(deptId); // 部门
|
||||||
entity.setPassword(passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD)); // 默认密码
|
entity.setPassword(passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD)); // 默认密码
|
||||||
// 性别翻译
|
// 性别翻译
|
||||||
String genderLabel = userImportVO.getGender();
|
String genderLabel = userImportVO.getGenderLabel();
|
||||||
if (StrUtil.isNotBlank(genderLabel)) {
|
if (StrUtil.isNotBlank(genderLabel)) {
|
||||||
Integer genderValue = (Integer) IBaseEnum.getValueByLabel(genderLabel, GenderEnum.class);
|
Integer genderValue = (Integer) IBaseEnum.getValueByLabel(genderLabel, GenderEnum.class);
|
||||||
entity.setGender(genderValue);
|
entity.setGender(genderValue);
|
||||||
@@ -129,7 +129,7 @@ public class UserImportListener extends MyAnalysisEventListener<UserImportVO> {
|
|||||||
.eq(SysRole::getStatus, StatusEnum.ENABLE.getValue())
|
.eq(SysRole::getStatus, StatusEnum.ENABLE.getValue())
|
||||||
.select(SysRole::getId)
|
.select(SysRole::getId)
|
||||||
).stream()
|
).stream()
|
||||||
.map(role -> role.getId())
|
.map(SysRole::getId)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,7 +146,7 @@ public class UserImportListener extends MyAnalysisEventListener<UserImportVO> {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
invalidCount++;
|
invalidCount++;
|
||||||
msg.append("第" + (validCount + invalidCount) + "行数据保存失败;<br/>");
|
msg.append("第").append(validCount + invalidCount).append("行数据保存失败;<br/>");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
invalidCount++;
|
invalidCount++;
|
||||||
|
|||||||
Reference in New Issue
Block a user