From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java
index 3e5a96c..cec4bf7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java
@@ -36,6 +36,14 @@
List<SysRoleVo> selectRolesByUserId(Long userId);
/**
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鍒楄〃(鍖呭惈琚巿鏉冪姸鎬�)
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 瑙掕壊鍒楄〃
+ */
+ List<SysRoleVo> selectRolesAuthByUserId(Long userId);
+
+ /**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鏉冮檺
*
* @param userId 鐢ㄦ埛ID
@@ -67,6 +75,14 @@
SysRoleVo selectRoleById(Long roleId);
/**
+ * 閫氳繃瑙掕壊ID涓叉煡璇㈣鑹�
+ *
+ * @param roleIds 瑙掕壊ID涓�
+ * @return 瑙掕壊鍒楄〃淇℃伅
+ */
+ List<SysRoleVo> selectRoleByIds(List<Long> roleIds);
+
+ /**
* 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
*
* @param role 瑙掕壊淇℃伅
@@ -85,9 +101,9 @@
/**
* 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
*
- * @param roleId 瑙掕壊ID
+ * @param role 瑙掕壊淇℃伅
*/
- void checkRoleAllowed(Long roleId);
+ void checkRoleAllowed(SysRoleBo role);
/**
* 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄�
@@ -178,4 +194,9 @@
* @return 缁撴灉
*/
int insertAuthUsers(Long roleId, Long[] userIds);
+
+ void cleanOnlineUserByRole(Long roleId);
+
+ void cleanOnlineUser(List<Long> userIds);
+
}
--
Gitblit v1.9.3