opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 17:58:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 增加注解默认值 简化一些操作

Browse Source
This commit is contained in:
疯狂的狮子li 2021-12-09 11:48:26 +08:00
parent 273453ba52
commit 30e0775fe2
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
View File

@ -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";
}

12
ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
View File

@ -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;

2
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
View File

@ -88,7 +88,7 @@ public class PlusDataPermissionHandler {
throw new ServiceException("角色数据范围异常 => " + role.getDataScope());
}
// 全部数据权限直接返回
if (type == DataScopeType.DATA_SCOPE_ALL) {
if (type == DataScopeType.ALL) {
return "";
}
// 不包含 key 变量 则不处理