tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 用户导入性别转换错误问题修复

Browse Source
This commit is contained in:
hxr
2024-01-20 23:24:18 +08:00
parent 9403479af7
commit 29f2413de6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/system/model/vo/UserImportVO.java
View File

@@ -19,7 +19,7 @@ public class UserImportVO {
private String nickname;
@ExcelProperty(value = "性别")
private String gender;
private String genderLabel;
@ExcelProperty(value = "手机号码")
private String mobile;

8
src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java
View File

@@ -107,13 +107,13 @@ public class UserImportListener extends MyAnalysisEventListener<UserImportVO> {
}
}
if (validationMsg.length() == 0) {
if (validationMsg.isEmpty()) {
// 校验通过，持久化至数据库
SysUser entity = userConverter.importVo2Entity(userImportVO);
entity.setDeptId(deptId); // 部门
entity.setPassword(passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD)); // 默认密码
// 性别翻译
String genderLabel = userImportVO.getGender();
String genderLabel = userImportVO.getGenderLabel();
if (StrUtil.isNotBlank(genderLabel)) {
Integer genderValue = (Integer) IBaseEnum.getValueByLabel(genderLabel, GenderEnum.class);
entity.setGender(genderValue);
@@ -129,7 +129,7 @@ public class UserImportListener extends MyAnalysisEventListener<UserImportVO> {
.eq(SysRole::getStatus, StatusEnum.ENABLE.getValue())
.select(SysRole::getId)
).stream()
.map(role -> role.getId())
.map(SysRole::getId)
.collect(Collectors.toList());
}
@@ -146,7 +146,7 @@ public class UserImportListener extends MyAnalysisEventListener<UserImportVO> {
}
} else {
invalidCount++;
msg.append("第" + (validCount + invalidCount) + "行数据保存失败；<br/>");
msg.append("第").append(validCount + invalidCount).append("行数据保存失败；<br/>");
}
} else {
invalidCount++;