diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java b/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java index d89df9a..8d5986d 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java +++ b/src/main/java/com/coscoshipping/ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java @@ -21,6 +21,6 @@ public class AllRolesAndAssignRoleVO { private List allRole; @ApiModelProperty("已分配的角色信息") - private List roleIds; + private List roleIds; } diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java b/src/main/java/com/coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java index c0b1735..1c9615b 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java +++ b/src/main/java/com/coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java @@ -30,5 +30,5 @@ public class SysUserVO extends SysUser implements Serializable { private BasePageRequest basePageRequest; @ApiModelProperty(value = "角色ID集合") - private List roleIds; + private List roleIds; } diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/entity/SysUserRole.java b/src/main/java/com/coscoshipping/ebtp/project/userrole/entity/SysUserRole.java index ce5e8f9..404055d 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/entity/SysUserRole.java +++ b/src/main/java/com/coscoshipping/ebtp/project/userrole/entity/SysUserRole.java @@ -25,7 +25,7 @@ public class SysUserRole implements Serializable { private String userId; @ApiModelProperty(value = "角色ID") - private Long roleId; + private String roleId; diff --git a/src/main/java/com/coscoshipping/ebtp/project/userrole/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/project/userrole/service/impl/SysUserRoleServiceImpl.java index 8a170dc..564ce70 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/userrole/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/project/userrole/service/impl/SysUserRoleServiceImpl.java @@ -35,7 +35,7 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl list = sysRoleService.list(); List userRoleList = list(Wrappers.lambdaQuery().eq(SysUserRole::getUserId, userId)); - List roleIds = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); + List roleIds = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); return new AllRolesAndAssignRoleVO(list, roleIds); } @@ -48,7 +48,7 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl userRoleList = new ArrayList<>(); - for (Long roleId : sysUserVO.getRoleIds()) { + for (String roleId : sysUserVO.getRoleIds()) { SysUserRole userRole = new SysUserRole(); userRole.setRoleId(roleId); userRole.setUserId(sysUserVO.getUserId());