From c73d01ce64268cd528270936097b19551b20c4be Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Tue, 13 Oct 2020 12:52:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?sysRole=20=E6=B7=BB=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hccake/ballcat/admin/modules/sys/model/entity/SysRole.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java index aea91422..44f8f61f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java @@ -66,4 +66,7 @@ public class SysRole extends Model { @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + @ApiModelProperty("数据权限：1全部，2本人，3本人及子部门，4本部门") + private Integer power; + } From 4a187de8b7da292a2737b488a0031ef4e68cb15f Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Tue, 13 Oct 2020 13:53:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95,?= =?UTF-8?q?=E6=8B=BC=E8=A3=85=E7=94=A8=E6=88=B7=E8=B5=84=E6=BA=90=20?= =?UTF-8?q?=E5=8D=8F=E8=B0=83=E8=80=85=20=E4=BC=A0=E5=85=A5user=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ballcat/admin/oauth/SysUserDetailsServiceImpl.java | 2 +- .../hccake/ballcat/admin/oauth/UserResourceCoordinator.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java index 587816e8..22979b6f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java @@ -74,7 +74,7 @@ public class SysUserDetailsServiceImpl implements UserDetailsService { userResources.put(UserResourceConstant.RESOURCE_ROLE_ID, roleIds); // 如果有自定义的协调者，进行资源处理 if (userResourceCoordinator != null) { - userResources = userResourceCoordinator.coordinate(userResources); + userResources = userResourceCoordinator.coordinate(userResources, sysUser); } return new SysUserDetails(sysUser, authorities, userResources); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java index fb1219b0..7c4fb883 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java @@ -1,5 +1,7 @@ package com.hccake.ballcat.admin.oauth; +import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; + import java.util.Collection; import java.util.Map; @@ -15,8 +17,9 @@ public interface UserResourceCoordinator { /** * 获取用户资源关联Map * @param userResources 用户资源 + * @param user 用户信息 * @return 用户资源关联Map => key: resource，value: 资源项 */ - Map> coordinate(Map> userResources); + Map> coordinate(Map> userResources, SysUser user); } From 4868d72ceb464327feed030250766d652051a7fe Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Wed, 14 Oct 2020 13:47:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9DTO=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java index b8df8732..cc9c100f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java @@ -29,4 +29,7 @@ public class SysRoleUpdateDTO { @ApiModelProperty(value = "角色备注") private String note; + @ApiModelProperty(value = "数据权限") + private Integer power; + } From 170f54b1ab5e40765a8519e9bac062a0e092f936 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Wed, 14 Oct 2020 14:00:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0sql=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/modules/sys/model/dto/SysRoleUpdateDTO.java | 2 +- .../ballcat/admin/modules/sys/model/entity/SysRole.java | 2 +- doc/update_sql/0.0.6.sql | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java index cc9c100f..2c8f4291 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java @@ -30,6 +30,6 @@ public class SysRoleUpdateDTO { private String note; @ApiModelProperty(value = "数据权限") - private Integer power; + private Integer scopeType; } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java index 44f8f61f..c9257f5c 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java @@ -67,6 +67,6 @@ public class SysRole extends Model { private LocalDateTime updateTime; @ApiModelProperty("数据权限：1全部，2本人，3本人及子部门，4本部门") - private Integer power; + private Integer scopeType; } diff --git a/doc/update_sql/0.0.6.sql b/doc/update_sql/0.0.6.sql index 2f22b67b..602621b7 100644 --- a/doc/update_sql/0.0.6.sql +++ b/doc/update_sql/0.0.6.sql @@ -60,4 +60,9 @@ CREATE TABLE `sys_lov_search` UNIQUE KEY (`keyword`, `field`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 - ROW_FORMAT = DYNAMIC COMMENT ='lov search'; \ No newline at end of file + ROW_FORMAT = DYNAMIC COMMENT ='lov search'; + + +-- 角色数据权限字段 +ALTER TABLE `ballcat`.`sys_role` +ADD COLUMN `scope_type` tinyint(1) NULL COMMENT '数据权限：1全部，2本人，3本人及子部门，4本部门' AFTER `update_time`; \ No newline at end of file