From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index 84e6478..d5838a8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -11,7 +11,7 @@
/**
* 瑙掕壊涓氬姟灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
public interface ISysRoleService extends IService<SysRole> {
@@ -24,7 +24,7 @@
* @param role 瑙掕壊淇℃伅
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
- public List<SysRole> selectRoleList(SysRole role);
+ List<SysRole> selectRoleList(SysRole role);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鍒楄〃
@@ -32,7 +32,7 @@
* @param userId 鐢ㄦ埛ID
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRolesByUserId(Long userId);
+ List<SysRole> selectRolesByUserId(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鏉冮檺
@@ -40,14 +40,14 @@
* @param userId 鐢ㄦ埛ID
* @return 鏉冮檺鍒楄〃
*/
- public Set<String> selectRolePermissionByUserId(Long userId);
+ Set<String> selectRolePermissionByUserId(Long userId);
/**
* 鏌ヨ鎵�鏈夎鑹�
*
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRoleAll();
+ List<SysRole> selectRoleAll();
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
@@ -55,7 +55,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
- public List<Integer> selectRoleListByUserId(Long userId);
+ List<Long> selectRoleListByUserId(Long userId);
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
@@ -63,7 +63,7 @@
* @param roleId 瑙掕壊ID
* @return 瑙掕壊瀵硅薄淇℃伅
*/
- public SysRole selectRoleById(Long roleId);
+ SysRole selectRoleById(Long roleId);
/**
* 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
@@ -71,7 +71,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public String checkRoleNameUnique(SysRole role);
+ String checkRoleNameUnique(SysRole role);
/**
* 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
@@ -79,21 +79,21 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public String checkRoleKeyUnique(SysRole role);
+ String checkRoleKeyUnique(SysRole role);
/**
* 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
*
* @param role 瑙掕壊淇℃伅
*/
- public void checkRoleAllowed(SysRole role);
+ void checkRoleAllowed(SysRole role);
/**
* 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄�
*
* @param roleId 瑙掕壊id
*/
- public void checkRoleDataScope(Long roleId);
+ void checkRoleDataScope(Long roleId);
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
@@ -101,7 +101,7 @@
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
- public long countUserRoleByRoleId(Long roleId);
+ long countUserRoleByRoleId(Long roleId);
/**
* 鏂板淇濆瓨瑙掕壊淇℃伅
@@ -109,7 +109,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int insertRole(SysRole role);
+ int insertRole(SysRole role);
/**
* 淇敼淇濆瓨瑙掕壊淇℃伅
@@ -117,7 +117,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int updateRole(SysRole role);
+ int updateRole(SysRole role);
/**
* 淇敼瑙掕壊鐘舵��
@@ -125,7 +125,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int updateRoleStatus(SysRole role);
+ int updateRoleStatus(SysRole role);
/**
* 淇敼鏁版嵁鏉冮檺淇℃伅
@@ -133,7 +133,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int authDataScope(SysRole role);
+ int authDataScope(SysRole role);
/**
* 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
@@ -141,7 +141,7 @@
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
- public int deleteRoleById(Long roleId);
+ int deleteRoleById(Long roleId);
/**
* 鎵归噺鍒犻櫎瑙掕壊淇℃伅
@@ -149,7 +149,7 @@
* @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
* @return 缁撴灉
*/
- public int deleteRoleByIds(Long[] roleIds);
+ int deleteRoleByIds(Long[] roleIds);
/**
* 鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
@@ -157,23 +157,23 @@
* @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭�
* @return 缁撴灉
*/
- public int deleteAuthUser(SysUserRole userRole);
+ int deleteAuthUser(SysUserRole userRole);
/**
* 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
*
- * @param roleId 瑙掕壊ID
+ * @param roleId 瑙掕壊ID
* @param userIds 闇�瑕佸彇娑堟巿鏉冪殑鐢ㄦ埛鏁版嵁ID
* @return 缁撴灉
*/
- public int deleteAuthUsers(Long roleId, Long[] userIds);
+ int deleteAuthUsers(Long roleId, Long[] userIds);
/**
* 鎵归噺閫夋嫨鎺堟潈鐢ㄦ埛瑙掕壊
*
- * @param roleId 瑙掕壊ID
+ * @param roleId 瑙掕壊ID
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID
* @return 缁撴灉
*/
- public int insertAuthUsers(Long roleId, Long[] userIds);
+ int insertAuthUsers(Long roleId, Long[] userIds);
}
--
Gitblit v1.9.3