From 30e0775fe29c533c4b31168a7773eea7f4f0effa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 9 Dec 2021 11:48:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=20=E7=AE=80=E5=8C=96=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/annotation/DataColumn.java |  4 ++--
 .../java/com/ruoyi/common/enums/DataScopeType.java   | 12 +++++++-----
 .../framework/handler/PlusDataPermissionHandler.java |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
index 343aaebc8..a6089db54 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
@@ -12,8 +12,8 @@ import java.lang.annotation.*;
 @Documented
 public @interface DataColumn {
 
-    String key();
+    String key() default "deptName";
 
-    String value();
+    String value() default "dept_id";
 
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
index 3b743e2a7..8e3fd5a16 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
@@ -9,6 +9,8 @@ import lombok.Getter;
  *
  * 语法支持 spel 模板表达式
  *
+ * 内置数据 当前用户的 deptId 部门id roleId 角色id userId 用户id
+ *
  * @author Lion Li
  */
 @Getter
@@ -18,27 +20,27 @@ public enum DataScopeType {
     /**
      * 全部数据权限
      */
-    DATA_SCOPE_ALL("1", ""),
+    ALL("1", ""),
 
     /**
      * 自定数据权限
      */
-    DATA_SCOPE_CUSTOM("2", " #{#deptName} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = #{#roleId} ) "),
+    CUSTOM("2", " #{#deptName} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = #{#roleId} ) "),
 
     /**
      * 部门数据权限
      */
-    DATA_SCOPE_DEPT("3", " #{#deptName} = #{#deptId} "),
+    DEPT("3", " #{#deptName} = #{#deptId} "),
 
     /**
      * 部门及以下数据权限
      */
-    DATA_SCOPE_DEPT_AND_CHILD("4", " #{#deptName} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{#deptId} OR find_in_set( #{#deptId} , ancestors ) )"),
+    DEPT_AND_CHILD("4", " #{#deptName} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{#deptId} OR find_in_set( #{#deptId} , ancestors ) )"),
 
     /**
      * 仅本人数据权限
      */
-    DATA_SCOPE_SELF("5", " #{#userName?:1} = #{#userId?:0} ");
+    SELF("5", " #{#userName?:1} = #{#userId} ");
 
     private final String code;
 
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
index 0f791ae8f..a4cf3df8d 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -88,7 +88,7 @@ public class PlusDataPermissionHandler {
                     throw new ServiceException("角色数据范围异常 => " + role.getDataScope());
                 }
                 // 全部数据权限直接返回
-                if (type == DataScopeType.DATA_SCOPE_ALL) {
+                if (type == DataScopeType.ALL) {
                     return "";
                 }
                 // 不包含 key 变量 则不处理