From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java
index f1bea3a..368fbfa 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java
@@ -24,8 +24,8 @@
* @return
* @date 2017年2月12日 下午9:14:34
*/
- List<Map<String, Object>> selectRoles(@Param("condition") String condition);
-
+// List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition, @Param("objectType") Integer objectType, @Param("objectId") Integer objectId);
/**
* 删除某个角色的所有权限
*
@@ -41,7 +41,7 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeList();
+ List<ZTreeNode> roleTreeList(@Param("type") Integer type, @Param("id") Integer id);
/**
* 获取角色列表树
@@ -49,5 +49,7 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeListByRoleId(String[] roleId);
+ List<ZTreeNode> roleTreeListByRoleId(@Param("array") String[] roleId, @Param("type") Integer type, @Param("id") Integer id);
+
+
}
\ No newline at end of file
--
Gitblit v1.7.1