From 65034371b2452e526953c56738dc9f7276f3519d Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Wed, 13 Nov 2024 20:14:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 3 +--
 .../src/main/resources/mapper/system/SysRoleMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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">