diff --git a/src/main/java/com/dc/dc_project/model/vo/OrgVo.java b/src/main/java/com/dc/dc_project/model/vo/OrgVo.java index 687b1fe..042f0c5 100644 --- a/src/main/java/com/dc/dc_project/model/vo/OrgVo.java +++ b/src/main/java/com/dc/dc_project/model/vo/OrgVo.java @@ -32,6 +32,4 @@ public class OrgVo implements TreeNode { private List standardCategorys; private List children; - - } diff --git a/src/main/java/com/dc/dc_project/model/vo/PermissionVo.java b/src/main/java/com/dc/dc_project/model/vo/PermissionVo.java index a12c19c..339583f 100644 --- a/src/main/java/com/dc/dc_project/model/vo/PermissionVo.java +++ b/src/main/java/com/dc/dc_project/model/vo/PermissionVo.java @@ -88,6 +88,11 @@ public class PermissionVo implements TreeNode { */ private Integer isDeleted; + /** + * 权限范围 + */ + private Integer dataScopeType; + private List children; public static PermissionVo toVo(Permission permission){ diff --git a/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java index 9e8a473..d8c0831 100644 --- a/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java @@ -144,7 +144,6 @@ public class OrgServiceImpl extends ServiceImpl if(queryDto.getId() == null){ return ResponseResult.error("参数缺失"); } - OrgQueryDto queryDto1 = new OrgQueryDto(); List list = baseMapper.getListAll(); for (OrgVo orgVo : list){ List standardCategorys = standardCategoryMapper.selectListByOrgId(orgVo.getId()); diff --git a/src/main/java/com/dc/dc_project/service/impl/PermissionServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/PermissionServiceImpl.java index 3ebd80d..9746b4b 100644 --- a/src/main/java/com/dc/dc_project/service/impl/PermissionServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/PermissionServiceImpl.java @@ -54,8 +54,30 @@ public class PermissionServiceImpl extends ServiceImpl page = this.page(permissionDto.getPage(), queryWrapper); List permissionList = baseMapper.getList(permissionDto); + List permissionVoList; + if(permissionDto.getRoleId() != null){ + permissionVoList = permissionList.stream() + .map(PermissionVo::toVo) + .map(p -> { + // 1. 获取查询结果对象 + RolePermission rp = rolePermissionService.getOne( + new LambdaQueryWrapper() + .eq(RolePermission::getPermissionId, p.getId()) + .eq(RolePermission::getRoleId, permissionDto.getRoleId()) + ); + if (rp != null) { + p.setDataScopeType(rp.getDataScopeType()); + } else { + p.setDataScopeType(2); + } + return p; + }) + .toList(); + } + else{ + permissionVoList = permissionList.stream().map(PermissionVo::toVo).toList(); + } - List permissionVoList = permissionList.stream().map(PermissionVo::toVo).toList(); List root = TreeUtil.buildTree(permissionVoList, 1L);