From ee8d7d16d0b1f279dbf750c1c98f498d9a2fb92f Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Tue, 11 Feb 2025 20:57:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor(user):=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=9B=E5=BB=BA=E5=92=8C=E6=9B=B4=E6=96=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 UserCreateDto 和 UserUpdateDto 中的 roleIds 类型从 Set 改为 List
- 更新 UserCreateDto 和 UserUpdateDto 中的 roleId 字段注释
- 调整 UserServiceImpl 中的 create 和 addUserRole 方法，以适应新的 List 类型
- 为 UserCreateDto 和 UserUpdateDto 中的 roleIds 添加 NotEmpty 注解
---
 .../zsc/edu/gateway/modules/system/dto/UserCreateDto.java    | 5 +++--
 .../zsc/edu/gateway/modules/system/dto/UserUpdateDto.java    | 4 ++--
 .../gateway/modules/system/service/impl/UserServiceImpl.java | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserCreateDto.java b/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserCreateDto.java
index 8891692..e1be698 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserCreateDto.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserCreateDto.java
@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 
 import jakarta.validation.constraints.*;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -57,7 +58,6 @@ public class UserCreateDto {
     /**
      * 用户当前身份
      */
-    @NotEmpty(message = "角色不能为空")
     public Long roleId;
     /**
      * 昵称
@@ -84,5 +84,6 @@ public class UserCreateDto {
     /**
      * 用户角色id集合
      */
-    public Set<Long> roleIds;
+    @NotEmpty(message = "角色集合不能为空")
+    public List<Long> roleIds;
 }
diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserUpdateDto.java b/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserUpdateDto.java
index c3f0978..6657cbb 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserUpdateDto.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/system/dto/UserUpdateDto.java
@@ -64,11 +64,11 @@ public class UserUpdateDto {
     /**
      * 用户身份
      */
-    @NotEmpty(message = "角色不能为空")
     public Long roleId;
 
     public String remark;
 
-    public Set<Long> roleIds;
+    @NotEmpty(message = "角色集合不能为空")
+    public List<Long> roleIds;
 
 }
diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/UserServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/UserServiceImpl.java
index 684b616..06fea54 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/UserServiceImpl.java
@@ -52,6 +52,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
     @Override
     public Boolean create(UserCreateDto dto) {
         User user = new User();
+        dto.setRoleId(dto.getRoleIds().get(0));
         userMapper.convert(dto, user);
         boolean saveSuccess = save(user);
         if (!saveSuccess) {
@@ -76,6 +77,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
         }
         if (dto.getRoleIds() != null && !dto.getRoleIds().isEmpty()) {
             userRolesRepository.delete(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, id));
+            dto.setRoleId(dto.getRoleIds().get(0));
             addUserRole(dto.getRoleIds(), user.getId());
         }
         BeanUtils.copyProperties(dto, user);
@@ -155,7 +157,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
         return userDetails;
     }
 
-    public Boolean addUserRole(Set<Long> roleIds, Long userId) {
+    public Boolean addUserRole(List<Long> roleIds, Long userId) {
         List<UserRole> userRoles = roleIds.stream()
                 .map(roleId -> {
                     UserRole userRole = new UserRole();