From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 9d02ceb..84e6478 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
@@ -1,9 +1,8 @@
package com.ruoyi.system.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysUserRole;
import java.util.List;
@@ -14,7 +13,7 @@
*
* @author ruoyi
*/
-public interface ISysRoleService extends IServicePlus<SysRole> {
+public interface ISysRoleService extends IService<SysRole> {
TableDataInfo<SysRole> selectPageRoleList(SysRole role);
@@ -90,12 +89,19 @@
public void checkRoleAllowed(SysRole role);
/**
+ * 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param roleId 瑙掕壊id
+ */
+ public void checkRoleDataScope(Long roleId);
+
+ /**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
*
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
- public int countUserRoleByRoleId(Long roleId);
+ public long countUserRoleByRoleId(Long roleId);
/**
* 鏂板淇濆瓨瑙掕壊淇℃伅
--
Gitblit v1.9.3