diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 25c1e1d..a8fceee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -53,7 +53,6 @@ public class SysRoleServiceImpl extends ServiceImpl<TdLeaveMapper, TdLeave> impl * @return 角色数据集合信息 */ @Override - @DataScope(deptAlias = "d") public List<SysRole> selectRoleList(SysRole role) { return roleMapper.selectRoleList(role); @@ -126,7 +125,7 @@ public class SysRoleServiceImpl extends ServiceImpl<TdLeaveMapper, TdLeave> impl @Override public List<SysRole> selectRoleAll() { - return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); + return selectRoleList(new SysRole()); } /** diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 353bb86..317e943 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" </if> <!-- 数据范围过滤 --> - ${params.dataScope} + /* ${params.dataScope}*/ </select> <select id="selectRolesByUserId" parameterType="Long" resultMap="SysRoleResult">