From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index e0792c7..e2b3c01 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -1,8 +1,12 @@
package com.ruoyi.system.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.DataColumn;
+import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.page.BaseMapperPlus;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,19 +14,25 @@
/**
* 瑙掕壊琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
-public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
+public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, SysRole> {
- Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param("role") SysRole role);
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id")
+ })
+ Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
*
- * @param role 瑙掕壊淇℃伅
+ * @param queryWrapper 鏌ヨ鏉′欢
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
- public List<SysRole> selectRoleList(SysRole role);
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "d.dept_id")
+ })
+ List<SysRole> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
@@ -30,7 +40,7 @@
* @param userId 鐢ㄦ埛ID
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRolePermissionByUserId(Long userId);
+ List<SysRole> selectRolePermissionByUserId(Long userId);
/**
@@ -39,7 +49,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
- public List<Integer> selectRoleListByUserId(Long userId);
+ List<Long> selectRoleListByUserId(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
@@ -47,6 +57,6 @@
* @param userName 鐢ㄦ埛鍚�
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRolesByUserName(String userName);
+ List<SysRole> selectRolesByUserName(String userName);
}
--
Gitblit v1.9.3