From 29f2413de64a4da0aecda28ee3f3acef15ac42c6 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Sat, 20 Jan 2024 23:24:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E8=BD=AC=E6=8D=A2=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/youlai/system/model/vo/UserImportVO.java     | 2 +-
 .../system/plugin/easyexcel/UserImportListener.java       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/youlai/system/model/vo/UserImportVO.java b/src/main/java/com/youlai/system/model/vo/UserImportVO.java
index 228e6cab..47b3c68d 100644
--- a/src/main/java/com/youlai/system/model/vo/UserImportVO.java
+++ b/src/main/java/com/youlai/system/model/vo/UserImportVO.java
@@ -19,7 +19,7 @@ public class UserImportVO {
     private String nickname;
 
     @ExcelProperty(value = "性别")
-    private String gender;
+    private String genderLabel;
 
     @ExcelProperty(value = "手机号码")
     private String mobile;
diff --git a/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java b/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java
index 573ce1a9..fad97b54 100644
--- a/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java
+++ b/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java
@@ -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++;