From d439395724442a0eace6632a066763fd07184a58 Mon Sep 17 00:00:00 2001
From: limin <limin@qq.com>
Date: Mon, 6 Jan 2025 20:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=81=E5=B8=88=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/enums/common/UserImportEnums.java   |  8 ++------
 .../system/controller/admin/user/UserController.java  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java
index 5730bf48b..42c12ff0d 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java
@@ -13,12 +13,8 @@ public enum UserImportEnums implements IntArrayValuable {
 
     STUDENT_0(0, "学生"),
     STUDENT_1(1, "学员"),
-    SEX_1(1, "男"),
-    SEX_2(2, "女"),
-    TEACHER_0(0, "老师"),
-    TEACHER_1(1, "教师"),
-    ENABLE(0, "开启"),
-    DISABLE(1, "关闭");
+    TEACHER_0(0, "教师"),
+    TEACHER_1(1, "培训教师");
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(UserImportEnums::getStatus).toArray();
 
     /**
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index ab4449ddd..b6182c0c3 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -31,6 +31,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -275,7 +276,15 @@ public class UserController {
         if (!list.isEmpty()) {
             list.stream().forEach(sysStudentUser ->{
                 AdminUserDO user = new AdminUserDO();
-                BeanUtil.copyProperties(sysStudentUser, user);
+                user.setUsername(sysStudentUser.getUsername());
+                user.setUserNo(sysStudentUser.getUserNo());
+                user.setNickname(sysStudentUser.getNickname());
+                user.setEmail(sysStudentUser.getEmail());
+                user.setMobile(sysStudentUser.getMobile());
+                user.setSex(Integer.valueOf(sysStudentUser.getSex()));
+                user.setStatus(Integer.valueOf(sysStudentUser.getStatus()));
+                user.setBirthDate(LocalDateTime.parse(sysStudentUser.getBirthDate()));
+                user.setStatusType(UserImportEnums.getStatusByName(sysStudentUser.getStatusType()));
                 user.setUserType(1);
                 userList.add(user);
             });