Merge pull request #39 from GaoDongshuai/master

数据权限，用户资源协调者修改

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 scopeType;
+
 }

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<SysRole> {
 	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private LocalDateTime updateTime;
 
+	@ApiModelProperty("数据权限：1全部，2本人，3本人及子部门，4本部门")
+	private Integer scopeType;
+
 }

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

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<String, Collection<?>> coordinate(Map<String, Collection<?>> userResources);
+	Map<String, Collection<?>> coordinate(Map<String, Collection<?>> userResources, SysUser user);
 
 }

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';
+  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`;