diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
index c5fbc7f3b..f1a4f9f34 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
@@ -6,19 +6,27 @@ import java.lang.annotation.*;
  * 数据权限过滤注解
  *
  * @author ruoyi
+ * @deprecated 3.6.0 移除 {@link com.ruoyi.common.annotation.DataPermission}
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Deprecated
 public @interface DataScope {
+
     /**
      * 部门表的别名
      */
-    String deptName() default "";
+    String deptAlias() default "";
 
     /**
      * 用户表的别名
      */
-    String userName() default "";
+    String userAlias() default "";
+
+    /**
+     * 是否过滤用户权限
+     */
+    boolean isUser() default false;
 
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 9af991d29..1a0d8e042 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -1,140 +1,142 @@
-//package com.ruoyi.framework.aspectj;
-//
-//import com.ruoyi.common.annotation.DataScope;
-//import com.ruoyi.common.core.domain.BaseEntity;
-//import com.ruoyi.common.core.domain.entity.SysRole;
-//import com.ruoyi.common.core.domain.entity.SysUser;
-//import com.ruoyi.common.core.domain.model.LoginUser;
-//import com.ruoyi.common.core.service.UserService;
-//import com.ruoyi.common.utils.SecurityUtils;
-//import com.ruoyi.common.utils.StringUtils;
-//import com.ruoyi.common.utils.spring.SpringUtils;
-//import org.aspectj.lang.JoinPoint;
-//import org.aspectj.lang.annotation.Aspect;
-//import org.aspectj.lang.annotation.Before;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * 数据过滤处理
-// *
-// * @author Lion Li
-// */
-//@Aspect
-//@Component
-//public class DataScopeAspect {
-//
-//	/**
-//	 * 全部数据权限
-//	 */
-//	public static final String DATA_SCOPE_ALL = "1";
-//
-//	/**
-//	 * 自定数据权限
-//	 */
-//	public static final String DATA_SCOPE_CUSTOM = "2";
-//
-//	/**
-//	 * 部门数据权限
-//	 */
-//	public static final String DATA_SCOPE_DEPT = "3";
-//
-//	/**
-//	 * 部门及以下数据权限
-//	 */
-//	public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-//
-//	/**
-//	 * 仅本人数据权限
-//	 */
-//	public static final String DATA_SCOPE_SELF = "5";
-//
-//	/**
-//	 * 数据权限过滤关键字
-//	 */
-//	public static final String DATA_SCOPE = "dataScope";
-//
-//	@Before("@annotation(controllerDataScope)")
-//	public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable {
-//		clearDataScope(point);
-//		handleDataScope(point, controllerDataScope);
-//	}
-//
-//	protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
-//		// 获取当前的用户
-//		LoginUser loginUser = SecurityUtils.getLoginUser();
-//		if (StringUtils.isNotNull(loginUser)) {
-//			SysUser currentUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId());
-//            // 如果是超级管理员，则不过滤数据
-//			if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
-//				dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
-//					controllerDataScope.userAlias(), controllerDataScope.isUser());
-//			}
-//		}
-//	}
-//
-//	/**
-//	 * 数据范围过滤
-//	 *
-//	 * @param joinPoint 切点
-//	 * @param user      用户
-//	 * @param userAlias 别名
-//	 */
-//	public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, boolean isUser) {
-//		StringBuilder sqlString = new StringBuilder();
-//
-//		// 将 "." 提取出,不写别名为单表查询,写别名为多表查询
-//		deptAlias = StringUtils.isNotBlank(deptAlias) ? deptAlias + "." : "";
-//		userAlias = StringUtils.isNotBlank(userAlias) ? userAlias + "." : "";
-//
-//		for (SysRole role : user.getRoles()) {
-//			String dataScope = role.getDataScope();
-//			if (DATA_SCOPE_ALL.equals(dataScope)) {
-//				sqlString = new StringBuilder();
-//				break;
-//			} else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
-//				sqlString.append(StringUtils.format(
-//					" OR {}dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ",
-//					deptAlias, role.getRoleId()));
-//			} else if (DATA_SCOPE_DEPT.equals(dataScope)) {
-//				sqlString.append(StringUtils.format(" OR {}dept_id = {} ",
-//					deptAlias, user.getDeptId()));
-//			} else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
-//				sqlString.append(StringUtils.format(
-//					" OR {}dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
-//					deptAlias, user.getDeptId(), user.getDeptId()));
-//			} else if (DATA_SCOPE_SELF.equals(dataScope)) {
-//				if (isUser) {
-//					sqlString.append(StringUtils.format(" OR {}user_id = {} ",
-//						userAlias, user.getUserId()));
-//				} else {
-//					// 数据权限为仅本人且没有userAlias别名不查询任何数据
-//					sqlString.append(" OR 1=0 ");
-//				}
-//			}
-//		}
-//
-//		if (StringUtils.isNotBlank(sqlString.toString())) {
-//			putDataScope(joinPoint, sqlString.substring(4));
-//		}
-//	}
-//
-//	/**
-//	 * 拼接权限sql前先清空params.dataScope参数防止注入
-//	 */
-//	private void clearDataScope(final JoinPoint joinPoint) {
-//		Object params = joinPoint.getArgs()[0];
-//		if (StringUtils.isNotNull(params)) {
-//			putDataScope(joinPoint, "");
-//		}
-//	}
-//
-//	private static void putDataScope(JoinPoint joinPoint, String sql) {
-//		Object params = joinPoint.getArgs()[0];
-//		if (StringUtils.isNotNull(params)) {
-//			if (params instanceof BaseEntity) {
-//				BaseEntity baseEntity = (BaseEntity) params;
-//				baseEntity.getParams().put(DATA_SCOPE, sql);
-//			}
-//		}
-//	}
-//}
+package com.ruoyi.framework.aspectj;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+/**
+ * 数据过滤处理
+ *
+ * @author Lion Li
+ * @deprecated 3.6.0 移除 {@link com.ruoyi.framework.handler.PlusDataPermissionHandler}
+ */
+@Aspect
+@Component
+@Deprecated
+public class DataScopeAspect {
+
+	/**
+	 * 全部数据权限
+	 */
+	public static final String DATA_SCOPE_ALL = "1";
+
+	/**
+	 * 自定数据权限
+	 */
+	public static final String DATA_SCOPE_CUSTOM = "2";
+
+	/**
+	 * 部门数据权限
+	 */
+	public static final String DATA_SCOPE_DEPT = "3";
+
+	/**
+	 * 部门及以下数据权限
+	 */
+	public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+	/**
+	 * 仅本人数据权限
+	 */
+	public static final String DATA_SCOPE_SELF = "5";
+
+	/**
+	 * 数据权限过滤关键字
+	 */
+	public static final String DATA_SCOPE = "dataScope";
+
+	@Before("@annotation(controllerDataScope)")
+	public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable {
+		clearDataScope(point);
+		handleDataScope(point, controllerDataScope);
+	}
+
+	protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
+		// 获取当前的用户
+		LoginUser loginUser = SecurityUtils.getLoginUser();
+		if (StringUtils.isNotNull(loginUser)) {
+			SysUser currentUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId());
+            // 如果是超级管理员，则不过滤数据
+			if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
+				dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
+					controllerDataScope.userAlias(), controllerDataScope.isUser());
+			}
+		}
+	}
+
+	/**
+	 * 数据范围过滤
+	 *
+	 * @param joinPoint 切点
+	 * @param user      用户
+	 * @param userAlias 别名
+	 */
+	public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, boolean isUser) {
+		StringBuilder sqlString = new StringBuilder();
+
+		// 将 "." 提取出,不写别名为单表查询,写别名为多表查询
+		deptAlias = StringUtils.isNotBlank(deptAlias) ? deptAlias + "." : "";
+		userAlias = StringUtils.isNotBlank(userAlias) ? userAlias + "." : "";
+
+		for (SysRole role : user.getRoles()) {
+			String dataScope = role.getDataScope();
+			if (DATA_SCOPE_ALL.equals(dataScope)) {
+				sqlString = new StringBuilder();
+				break;
+			} else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
+				sqlString.append(StringUtils.format(
+					" OR {}dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ",
+					deptAlias, role.getRoleId()));
+			} else if (DATA_SCOPE_DEPT.equals(dataScope)) {
+				sqlString.append(StringUtils.format(" OR {}dept_id = {} ",
+					deptAlias, user.getDeptId()));
+			} else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
+				sqlString.append(StringUtils.format(
+					" OR {}dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+					deptAlias, user.getDeptId(), user.getDeptId()));
+			} else if (DATA_SCOPE_SELF.equals(dataScope)) {
+				if (isUser) {
+					sqlString.append(StringUtils.format(" OR {}user_id = {} ",
+						userAlias, user.getUserId()));
+				} else {
+					// 数据权限为仅本人且没有userAlias别名不查询任何数据
+					sqlString.append(" OR 1=0 ");
+				}
+			}
+		}
+
+		if (StringUtils.isNotBlank(sqlString.toString())) {
+			putDataScope(joinPoint, sqlString.substring(4));
+		}
+	}
+
+	/**
+	 * 拼接权限sql前先清空params.dataScope参数防止注入
+	 */
+	private void clearDataScope(final JoinPoint joinPoint) {
+		Object params = joinPoint.getArgs()[0];
+		if (StringUtils.isNotNull(params)) {
+			putDataScope(joinPoint, "");
+		}
+	}
+
+	private static void putDataScope(JoinPoint joinPoint, String sql) {
+		Object params = joinPoint.getArgs()[0];
+		if (StringUtils.isNotNull(params)) {
+			if (params instanceof BaseEntity) {
+				BaseEntity baseEntity = (BaseEntity) params;
+				baseEntity.getParams().put(DATA_SCOPE, sql);
+			}
+		}
+	}
+}