From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IRoleService.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IRoleService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IRoleService.java
index d335036..f0e102b 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IRoleService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IRoleService.java
@@ -18,8 +18,10 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.system.entity.Menu;
 import com.vci.ubcs.system.entity.Role;
 import com.vci.ubcs.system.vo.RoleVO;
+import org.springblade.core.tool.api.R;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
@@ -49,6 +51,13 @@
 	List<RoleVO> tree(String tenantId);
 
 	/**
+	 * 鍔犺浇瑙掕壊鍒楄〃
+	 * @param tenantId
+	 * @return
+	 */
+	List<RoleVO> roleList(String tenantId);
+
+	/**
 	 * 鏉冮檺閰嶇疆
 	 *
 	 * @param roleIds      瑙掕壊id闆嗗悎
@@ -60,6 +69,20 @@
 	boolean grant(@NotEmpty List<Long> roleIds, List<Long> menuIds, List<Long> dataScopeIds, List<Long> apiScopeIds);
 
 	/**
+	 * 瑙掕壊鏉冮檺閰嶇疆鏃ュ織璁板綍
+	 * @param roleRes
+	 * @return
+	 */
+	boolean grantLog(String roleRes, boolean isException);
+
+	/**
+	 * 鑾峰彇瑙掕壊鎺堟潈鏃ュ織鐨勪俊鎭�
+	 * @param roleId
+	 * @return
+	 */
+	String getGrantRoleResString(List<Long> roleId);
+
+	/**
 	 * 鑾峰彇瑙掕壊ID
 	 *
 	 * @param tenantId

--
Gitblit v1.9.3