syy/SYYTe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

This commit is contained in:
阿沐 2022-10-25 14:59:11 +08:00
parent bd38ef7146
commit c782464258
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maku-boot-system/src/main/java/net/maku/system/enums/DataScopeEnum.java
View File

@ -14,13 +14,13 @@ public enum DataScopeEnum {
*/ */
ALL(0), ALL(0),
/** /**
* 本部门及子部门数据 * 本机构及子机构数据
*/ */
DEPT_AND_CHILD(1), ORG_AND_CHILD(1),
/** /**
* 本部门数据 * 本机构数据
*/ */
DEPT_ONLY(2), ORG_ONLY(2),
/** /**
* 本人数据 * 本人数据
*/ */

8
maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserDetailsServiceImpl.java
View File

@ -61,15 +61,15 @@ public class SysUserDetailsServiceImpl implements SysUserDetailsService {
if (dataScope.equals(DataScopeEnum.ALL.getValue())) { if (dataScope.equals(DataScopeEnum.ALL.getValue())) {
// 全部数据权限，则返回null // 全部数据权限，则返回null
return null; return null;
} else if (dataScope.equals(DataScopeEnum.DEPT_AND_CHILD.getValue())) { } else if (dataScope.equals(DataScopeEnum.ORG_AND_CHILD.getValue())) {
// 本部门及子部门数据 // 本机构及子机构数据
List<Long> dataScopeList = sysOrgService.getSubOrgIdList(userDetail.getOrgId()); List<Long> dataScopeList = sysOrgService.getSubOrgIdList(userDetail.getOrgId());
// 自定义数据权限范围 // 自定义数据权限范围
dataScopeList.addAll(sysRoleDataScopeDao.getDataScopeList(userDetail.getId())); dataScopeList.addAll(sysRoleDataScopeDao.getDataScopeList(userDetail.getId()));
return dataScopeList; return dataScopeList;
} else if (dataScope.equals(DataScopeEnum.DEPT_ONLY.getValue())) { } else if (dataScope.equals(DataScopeEnum.ORG_ONLY.getValue())) {
// 本部门数据 // 本机构数据
List<Long> dataScopeList = new ArrayList<>(); List<Long> dataScopeList = new ArrayList<>();
dataScopeList.add(userDetail.getOrgId()); dataScopeList.add(userDetail.getOrgId());
// 自定义数据权限范围 // 自定义数据权限范围

18
maku-boot-system/src/main/java/net/maku/system/vo/SysRoleDataScopeVO.java
View File

@ -15,17 +15,17 @@ import java.util.List;
@Data @Data
@Schema(description = "角色数据权限") @Schema(description = "角色数据权限")
public class SysRoleDataScopeVO implements Serializable { public class SysRoleDataScopeVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Schema(description = "id") @Schema(description = "id")
@NotNull(message = "角色ID不能为空") @NotNull(message = "角色ID不能为空")
private Long id; private Long id;
@Schema(description = "数据范围 0：全部数据 1：本部门及子部门数据 2：本部门数据 3：本人数据 4：自定义数据") @Schema(description = "数据范围 0：全部数据 1：本机构及子机构数据 2：本机构数据 3：本人数据 4：自定义数据")
@NotNull(message = "数据范围不能为空") @NotNull(message = "数据范围不能为空")
private Integer dataScope; private Integer dataScope;
@Schema(description = "机构ID列表") @Schema(description = "机构ID列表")
private List<Long> orgIdList; private List<Long> orgIdList;
} }

34
maku-boot-system/src/main/java/net/maku/system/vo/SysRoleVO.java
View File

@ -18,29 +18,29 @@ import java.util.List;
@Data @Data
@Schema(description = "角色") @Schema(description = "角色")
public class SysRoleVO implements Serializable { public class SysRoleVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Schema(description = "id") @Schema(description = "id")
private Long id; private Long id;
@Schema(description = "角色名称") @Schema(description = "角色名称")
@NotBlank(message = "角色名称不能为空") @NotBlank(message = "角色名称不能为空")
private String name; private String name;
@Schema(description = "备注") @Schema(description = "备注")
private String remark; private String remark;
@Schema(description = "数据范围 0：全部数据 1：本部门及子部门数据 2：本部门数据 3：本人数据 4：自定义数据") @Schema(description = "数据范围 0：全部数据 1：本机构及子机构数据 2：本机构数据 3：本人数据 4：自定义数据")
private Integer dataScope; private Integer dataScope;
@Schema(description = "菜单ID列表") @Schema(description = "菜单ID列表")
private List<Long> menuIdList; private List<Long> menuIdList;
@Schema(description = "机构ID列表") @Schema(description = "机构ID列表")
private List<Long> orgIdList; private List<Long> orgIdList;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private Date createTime;
} }