From 79aee1d3127c8be0184bc6493b08fb2ba2f1a8ae Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期六, 24 八月 2024 11:16:39 +0800
Subject: [PATCH] add 添加按照部门id，角色id查询用户
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java
index a0a29b1..ac5a47e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java
@@ -3,12 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.annotation.DataColumn;
import org.dromara.common.mybatis.annotation.DataPermission;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.domain.SysRole;
import org.dromara.system.domain.vo.SysRoleVo;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -20,7 +20,8 @@
public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
@DataPermission({
- @DataColumn(key = "deptName", value = "d.dept_id")
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "r.create_by")
})
Page<SysRoleVo> selectPageRoleList(@Param("page") Page<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
@@ -31,12 +32,14 @@
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
@DataPermission({
- @DataColumn(key = "deptName", value = "d.dept_id")
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "r.create_by")
})
List<SysRoleVo> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
@DataPermission({
- @DataColumn(key = "deptName", value = "d.dept_id")
+ @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "userName", value = "r.create_by")
})
SysRoleVo selectRoleById(Long roleId);
@@ -48,21 +51,12 @@
*/
List<SysRoleVo> selectRolePermissionByUserId(Long userId);
-
- /**
- * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
- *
- * @param userId 鐢ㄦ埛ID
- * @return 閫変腑瑙掕壊ID鍒楄〃
- */
- List<Long> selectRoleListByUserId(Long userId);
-
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userId 鐢ㄦ埛ID
* @return 瑙掕壊鍒楄〃
*/
- List<SysRoleVo> selectRolesByUserName(String userName);
+ List<SysRoleVo> selectRolesByUserId(Long userId);
}
--
Gitblit v1.9.3