From 7d1c53f92738166c1ced1a796e2bc95d26d35fa0 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 18 一月 2023 11:59:32 +0800 Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解 --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 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 eb44006..ff4f672 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.core.domain.entity.SysRole; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.ruoyi.common.annotation.DataColumn; +import com.ruoyi.common.annotation.DataPermission; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,17 +16,23 @@ * * @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 瑙掕壊鏁版嵁闆嗗悎淇℃伅 */ - List<SysRole> selectRoleList(SysRole role); + @DataPermission({ + @DataColumn(key = "deptName", value = "d.dept_id") + }) + List<SysRole> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper); /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊 -- Gitblit v1.9.3