From a548de804d8230e8c016e36320f1331a3619c2ed Mon Sep 17 00:00:00 2001
From: jlzhangyx5 <jl-zhangyx5@chinaunicom.cn>
Date: Thu, 22 May 2025 09:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/project/role/entity/vo/AllRolesAndAssignRoleVO.java  | 2 +-
 .../coscoshipping/ebtp/project/user/entity/vo/SysUserVO.java  | 2 +-
 .../ebtp/project/userrole/entity/SysUserRole.java             | 2 +-
 .../project/userrole/service/impl/SysUserRoleServiceImpl.java | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

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<SysRole> allRole;
 
     @ApiModelProperty("已分配的角色信息")
-    private List<Long> roleIds;
+    private List<String> 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<Long> roleIds;
+    private List<String> 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<SysUserRoleMapper,Sy
     public AllRolesAndAssignRoleVO getAllRolesAndAssignRole(String userId) {
         List<SysRole> list = sysRoleService.list();
         List<SysUserRole> userRoleList = list(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, userId));
-        List<Long> roleIds = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+        List<String> roleIds = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
         return new AllRolesAndAssignRoleVO(list, roleIds);
     }
 
@@ -48,7 +48,7 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper,Sy
 
         List<SysUserRole> userRoleList = new ArrayList<>();
 
-        for (Long roleId : sysUserVO.getRoleIds()) {
+        for (String roleId : sysUserVO.getRoleIds()) {
             SysUserRole userRole = new SysUserRole();
             userRole.setRoleId(roleId);
             userRole.setUserId(sysUserVO.getUserId());