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

fix(系统设置): 修复项目列表添加成员报错的缺陷 

--bug=1039449 --user=王孝刚 【系统设置】组织-项目列表-点击成员报错
https://www.tapd.cn/55049933/s/1498112
This commit is contained in:
wxg0103 2024-04-16 11:26:23 +08:00 committed by wxg0103
parent a9df04d1c5
commit a318e9ba85
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/OrganizationProjectController.java
View File

@ -121,7 +121,7 @@ public class OrganizationProjectController {
@PostMapping("/member-list")
@RequiresPermissions(PermissionConstants.ORGANIZATION_PROJECT_READ)
@Operation(summary = "系统设置-组织-项目-成员列表")
@CheckOwner(resourceId = "#reuqest.projectId", resourceType = "project")
@CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project")
public Pager<List<UserExtendDTO>> getProjectMember(@Validated @RequestBody ProjectMemberRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize());
return PageUtils.setPageInfo(page, organizationProjectService.getProjectMember(request));
@ -130,7 +130,7 @@ public class OrganizationProjectController {
@PostMapping("/add-members")
@RequiresPermissions(PermissionConstants.ORGANIZATION_PROJECT_MEMBER_ADD)
@Operation(summary = "系统设置-组织-项目-添加成员")
@CheckOwner(resourceId = "#request.projectId", resourceType = "project")
@CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project")
public void addProjectMember(@Validated @RequestBody ProjectAddMemberRequest request) {
ProjectAddMemberBatchRequest batchRequest = new ProjectAddMemberBatchRequest();
batchRequest.setProjectIds(List.of(request.getProjectId()));
@ -171,7 +171,7 @@ public class OrganizationProjectController {
@PostMapping("/pool-options")
@Operation(summary = "系统设置-组织-项目-获取资源池下拉选项")
@RequiresPermissions(PermissionConstants.ORGANIZATION_PROJECT_READ)
@CheckOwner(resourceId = "#request.organizationId", resourceType = "organization")
@CheckOwner(resourceId = "#request.getOrganizationId()", resourceType = "organization")
public List<OptionDTO> getProjectOptions(@Validated @RequestBody ProjectPoolRequest request) {
return organizationProjectService.getTestResourcePoolOptions(request);
}
@ -180,7 +180,7 @@ public class OrganizationProjectController {
@Operation(summary = "系统设置-组织-项目-修改项目名称")
@RequiresPermissions(PermissionConstants.ORGANIZATION_PROJECT_READ_UPDATE)
@Log(type = OperationLogType.UPDATE, expression = "#msClass.renameLog(#request)", msClass = OrganizationProjectLogService.class)
@CheckOwner(resourceId = "#request.id", resourceType = "project")
@CheckOwner(resourceId = "#request.getId()", resourceType = "project")
public void rename(@RequestBody @Validated({Updated.class}) UpdateProjectNameRequest request) {
organizationProjectService.rename(request, SessionUtils.getUserId());
}