Forráskód Böngészése

解决用户添加时无法设置多个角色的问题

dzx 1 éve
szülő
commit
0a57d4806c

+ 6 - 0
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -272,6 +272,12 @@ public class UserController {
                 .stream().map(UserDeptRelation::getDeptId).collect(Collectors.toList());
         String allDeptIdStr = StrUtil.join(StringPool.COMMA, deptIds);
         userVo.setDepartmentIds(allDeptIdStr);
+
+        List<Long> roleIds = userRoleRelationService.list(
+                Wrappers.lambdaQuery(UserRoleRelation.class)
+                .eq(UserRoleRelation::getUserId, user.getId())
+                ).stream().map(UserRoleRelation::getRoleId).collect(Collectors.toList());
+        userVo.setRoleIds(roleIds);
         return R.ok(userVo);
     }
 

+ 2 - 1
src/main/java/com/xjrsoft/module/organization/dto/AddUserDto.java

@@ -12,6 +12,7 @@ import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @title: AddUserDto
@@ -60,7 +61,7 @@ public class AddUserDto implements Serializable {
 
     //@NotNull(message = "角色不能为空!")
     @ApiModelProperty(value = "角色Id",required = true)
-    private Long roleId;
+    private List<Long> roleIds;
 
     @ApiModelProperty("头像")
     private String avatar;

+ 4 - 0
src/main/java/com/xjrsoft/module/organization/vo/UserVo.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @title: UserVo
@@ -111,5 +112,8 @@ public class UserVo implements Serializable {
 
     @ApiModelProperty("生日")
     private LocalDateTime birthDate;
+
+    @ApiModelProperty("角色id")
+    private List<Long> roleIds;
 }