test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: change the permission

This commit is contained in:
guoyuqi 2023-08-11 13:58:54 +08:00 committed by 刘瑞斌
parent 2bda39e252
commit 398c490001
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java
View File

@ -40,7 +40,7 @@ public class OrganizationController {
@PostMapping("/member/list") @PostMapping("/member/list")
@Operation(summary = "组织级别获取组织成员") @Operation(summary = "组织级别获取组织成员")
@RequiresPermissions(value = {PermissionConstants.ORGANIZATION_MEMBER_READ, PermissionConstants.SYSTEM_USER_READ}, logical = Logical.OR) @RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_READ)
public Pager<List<OrgUserExtend>> getMemberList(@Validated @RequestBody OrganizationRequest organizationRequest) { public Pager<List<OrgUserExtend>> getMemberList(@Validated @RequestBody OrganizationRequest organizationRequest) {
Page<Object> page = PageHelper.startPage(organizationRequest.getCurrent(), organizationRequest.getPageSize()); Page<Object> page = PageHelper.startPage(organizationRequest.getCurrent(), organizationRequest.getPageSize());
return PageUtils.setPageInfo(page, organizationService.getMemberListByOrg(organizationRequest)); return PageUtils.setPageInfo(page, organizationService.getMemberListByOrg(organizationRequest));
@ -88,21 +88,21 @@ public class OrganizationController {
@GetMapping("/project/list/{organizationId}") @GetMapping("/project/list/{organizationId}")
@Operation(summary = "获取当前组织下的所有项目") @Operation(summary = "获取当前组织下的所有项目")
@RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_UPDATE) @RequiresPermissions(PermissionConstants.ORGANIZATION_PROJECT_READ)
public List<IdNameStructureDTO> getProjectList(@PathVariable(value = "organizationId") String organizationId) { public List<IdNameStructureDTO> getProjectList(@PathVariable(value = "organizationId") String organizationId) {
return organizationService.getProjectList(organizationId); return organizationService.getProjectList(organizationId);
} }
@GetMapping("/user/role/list/{organizationId}") @GetMapping("/user/role/list/{organizationId}")
@Operation(summary = "获取当前组织下的所有自定义用户组以及组织级别的用户组") @Operation(summary = "获取当前组织下的所有自定义用户组以及组织级别的用户组")
@RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_UPDATE) @RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_READ)
public List<IdNameStructureDTO> getUserRoleList(@PathVariable(value = "organizationId") String organizationId) { public List<IdNameStructureDTO> getUserRoleList(@PathVariable(value = "organizationId") String organizationId) {
return organizationService.getUserRoleList(organizationId); return organizationService.getUserRoleList(organizationId);
} }
@GetMapping("/not-exist/user/list/{organizationId}") @GetMapping("/not-exist/user/list/{organizationId}")
@Operation(summary = "获取不在当前组织的所有用户") @Operation(summary = "获取不在当前组织的所有用户")
@RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_UPDATE) @RequiresPermissions(PermissionConstants.SYSTEM_USER_ROLE_READ)
public List<IdNameStructureDTO> getUserList(@PathVariable(value = "organizationId") String organizationId) { public List<IdNameStructureDTO> getUserList(@PathVariable(value = "organizationId") String organizationId) {
return organizationService.getUserList(organizationId); return organizationService.getUserList(organizationId);
} }