数据范围过滤属性调整

ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -52,6 +52,11 @@ public class DataScopeAspect
      */
     public static final String DATA_SCOPE_SELF = "5";
 
+    /**
+     * 数据权限过滤关键字
+     */
+    public static final String DATA_SCOPE = "dataScope";
+
     // 配置织入点
     @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)")
     public void dataScopePointCut()
@@ -138,7 +143,7 @@ public class DataScopeAspect
         if (StringUtils.isNotBlank(sqlString.toString()))
         {
             BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];
-            baseEntity.setDataScope(" AND (" + sqlString.substring(4) + ")");
+            baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
         }
     }
 

ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java

@@ -36,9 +36,6 @@ public class BaseEntity implements Serializable
     /** 备注 */
     private String remark;
 
-    /** 数据权限 */
-    private String dataScope;
-
     /** 开始时间 */
     @JsonIgnore
     private String beginTime;
@@ -110,16 +107,6 @@ public class BaseEntity implements Serializable
         this.remark = remark;
     }
 
-    public String getDataScope()
-    {
-        return dataScope;
-    }
-
-    public void setDataScope(String dataScope)
-    {
-        this.dataScope = dataScope;
-    }
-
     public String getBeginTime()
     {
         return beginTime;

ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND status = #{status}
 		</if>
 		<!-- 数据范围过滤 -->
-		${dataScope}
+		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
     

ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			and date_format(r.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
 		</if>
 		<!-- 数据范围过滤 -->
-		${dataScope}
+		${params.dataScope}
 		order by r.role_sort
 	</select>
     

ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ))
 		</if>
 		<!-- 数据范围过滤 -->
-		${dataScope}
+		${params.dataScope}
 	</select>
 	
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">