From 9bd15aa8b7f9dfc6aa8d18e99859b695630ab5c5 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Mon, 11 May 2020 16:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=91=98=E8=A7=92=E8=89=B2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/controller/WorkspaceController.java | 2 +- .../io/metersphere/service/OrganizationService.java | 6 +----- .../io/metersphere/service/WorkspaceService.java | 13 +++++-------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java index 3c4f7e718..3c6d2153d 100644 --- a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java +++ b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java @@ -53,7 +53,7 @@ public class WorkspaceController { @PostMapping("special/update") @RequiresRoles(RoleConstants.ADMIN) public void updateWorkspaceByAdmin(@RequestBody Workspace workspace) { - workspaceService.updateWorkspacebyAdmin(workspace); + workspaceService.updateWorkspaceByAdmin(workspace); } @GetMapping("special/delete/{workspaceId}") diff --git a/backend/src/main/java/io/metersphere/service/OrganizationService.java b/backend/src/main/java/io/metersphere/service/OrganizationService.java index c54b4860d..be619c75b 100644 --- a/backend/src/main/java/io/metersphere/service/OrganizationService.java +++ b/backend/src/main/java/io/metersphere/service/OrganizationService.java @@ -109,12 +109,8 @@ public class OrganizationService { } public void updateOrgMember(OrganizationMemberDTO memberDTO) { - User user = new User(); - BeanUtils.copyProperties(memberDTO, user); - userMapper.updateByPrimaryKeySelective(user); - // String orgId = memberDTO.getOrganizationId(); - String userId = user.getId(); + String userId = memberDTO.getId(); // 已有角色 List memberRoles = extUserRoleMapper.getOrganizationMemberRoles(orgId, userId); // 修改后的角色 diff --git a/backend/src/main/java/io/metersphere/service/WorkspaceService.java b/backend/src/main/java/io/metersphere/service/WorkspaceService.java index a17cfd885..69e0e32e4 100644 --- a/backend/src/main/java/io/metersphere/service/WorkspaceService.java +++ b/backend/src/main/java/io/metersphere/service/WorkspaceService.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -200,12 +201,8 @@ public class WorkspaceService { } public void updateWorkspaceMember(WorkspaceMemberDTO memberDTO) { - User user = new User(); - BeanUtils.copyProperties(memberDTO, user); - userMapper.updateByPrimaryKeySelective(user); - // String workspaceId = memberDTO.getWorkspaceId(); - String userId = user.getId(); + String userId = memberDTO.getId(); // 已有角色 List memberRoles = extUserRoleMapper.getWorkspaceMemberRoles(workspaceId, userId); // 修改后的角色 @@ -234,11 +231,11 @@ public class WorkspaceService { } } - public Integer checkSourceRole(String orgId, String userId, String roleId) { - return extOrganizationMapper.checkSourceRole(orgId, userId, roleId); + public Integer checkSourceRole(String workspaceId, String userId, String roleId) { + return extOrganizationMapper.checkSourceRole(workspaceId, userId, roleId); } - public void updateWorkspacebyAdmin(Workspace workspace) { + public void updateWorkspaceByAdmin(Workspace workspace) { workspace.setCreateTime(null); workspace.setUpdateTime(System.currentTimeMillis()); workspaceMapper.updateByPrimaryKeySelective(workspace); -- GitLab