From 4f0a584efcbe51c5c232ab6f75a8d760b15d5e03 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 01 四月 2022 17:57:00 +0800
Subject: [PATCH] update springboot 2.6.5 => 2.6.6 修复 CVE-2022-22965 漏洞
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 92 +++++++++++----------------------------------
1 files changed, 23 insertions(+), 69 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 b76ce7f..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,23 +1,38 @@
package com.ruoyi.system.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 瑙掕壊琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
-public interface SysRoleMapper extends BaseMapper<SysRole> {
+public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, SysRole> {
+
+ @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鏌ヨ瑙掕壊
@@ -25,14 +40,8 @@
* @param userId 鐢ㄦ埛ID
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRolePermissionByUserId(Long userId);
+ List<SysRole> selectRolePermissionByUserId(Long userId);
- /**
- * 鏌ヨ鎵�鏈夎鑹�
- *
- * @return 瑙掕壊鍒楄〃
- */
- public List<SysRole> selectRoleAll();
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
@@ -40,15 +49,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
- public List<Integer> selectRoleListByUserId(Long userId);
-
- /**
- * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
- *
- * @param roleId 瑙掕壊ID
- * @return 瑙掕壊瀵硅薄淇℃伅
- */
- public SysRole selectRoleById(Long roleId);
+ List<Long> selectRoleListByUserId(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
@@ -56,53 +57,6 @@
* @param userName 鐢ㄦ埛鍚�
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRolesByUserName(String userName);
+ List<SysRole> selectRolesByUserName(String userName);
- /**
- * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
- *
- * @param roleName 瑙掕壊鍚嶇О
- * @return 瑙掕壊淇℃伅
- */
- public SysRole checkRoleNameUnique(String roleName);
-
- /**
- * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
- *
- * @param roleKey 瑙掕壊鏉冮檺
- * @return 瑙掕壊淇℃伅
- */
- public SysRole checkRoleKeyUnique(String roleKey);
-
- /**
- * 淇敼瑙掕壊淇℃伅
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int updateRole(SysRole role);
-
- /**
- * 鏂板瑙掕壊淇℃伅
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int insertRole(SysRole role);
-
- /**
- * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
- *
- * @param roleId 瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleById(Long roleId);
-
- /**
- * 鎵归噺鍒犻櫎瑙掕壊淇℃伅
- *
- * @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleByIds(Long[] roleIds);
}
--
Gitblit v1.9.3