From a361c8e9ca14233c5eeace4a4d0113d8e333c4a0 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 19 Jun 2024 18:59:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=87=8D=E5=86=99=E5=AF=B9=E6=8E=A5=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=EF=BC=9B=202=E3=80=81=E8=A7=92=E8=89=B2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0organid=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/permission/PermissionController.java       | 2 +-
 .../system/controller/admin/permission/vo/role/RoleRespVO.java  | 2 ++
 .../module/system/service/permission/PermissionServiceImpl.java | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
index 82f59af63..1cfe3e339 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
@@ -109,7 +109,7 @@ public class PermissionController {
     @PostMapping("/bath-assign-user-role")
     @PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')")
     public CommonResult<Boolean> bathAssignUserRole(@Validated @RequestBody PermissionAssignRoleUserReqVO reqVO) {
-//        permissionService.batchAssignRoleUsers(reqVO);
+        permissionService.batchAssignRoleUsers(reqVO);
         return success(true);
     }
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java
index 663917b27..be9d8f9a4 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java
@@ -54,4 +54,6 @@ public class RoleRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
+    @Schema(description = "组织id", example = "1")
+    private Long organId;
 }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
index 63b8706e7..403edf63e 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
@@ -271,7 +271,7 @@ public class PermissionServiceImpl implements PermissionService {
 
     @Override
     @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换
-    @CacheEvict(value = RedisKeyConstants.USER_ROLE_ID_LIST, key = "#userId")
+    @CacheEvict(value = RedisKeyConstants.USER_ROLE_ID_LIST, allEntries = true)
     public void batchAssignRoleUsers(PermissionAssignRoleUserReqVO reqVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         assert loginUser != null;