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

fix: 修复session里保存的权限没有及时刷新的问题

This commit is contained in:
Captain.B 2021-07-01 15:03:32 +08:00 committed by 刘瑞斌
parent 7414d2bbe6
commit 79c55ef6c9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/metersphere/service/CheckPermissionService.java
View File

@ -5,6 +5,7 @@ import io.metersphere.base.domain.UserGroup;
import io.metersphere.base.mapper.ext.*; import io.metersphere.base.mapper.ext.*;
import io.metersphere.commons.constants.UserGroupType; import io.metersphere.commons.constants.UserGroupType;
import io.metersphere.commons.utils.SessionUtils; import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.dto.UserDTO;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -12,7 +13,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -28,6 +28,8 @@ public class CheckPermissionService {
private ExtTestPlanMapper extTestPlanMapper; private ExtTestPlanMapper extTestPlanMapper;
@Resource @Resource
private ExtTestCaseReviewMapper extTestCaseReviewMapper; private ExtTestCaseReviewMapper extTestCaseReviewMapper;
@Resource
private UserService userService;
public void checkProjectOwner(String projectId) { public void checkProjectOwner(String projectId) {
Set<String> projectIds = getUserRelatedProjectIds(); Set<String> projectIds = getUserRelatedProjectIds();
@ -40,12 +42,13 @@ public class CheckPermissionService {
} }
public Set<String> getUserRelatedProjectIds() { public Set<String> getUserRelatedProjectIds() {
List<String> groupIds = Objects.requireNonNull(SessionUtils.getUser()).getGroups() UserDTO userDTO = userService.getUserDTO(SessionUtils.getUserId());
List<String> groupIds = userDTO.getGroups()
.stream() .stream()
.filter(g -> StringUtils.equals(g.getType(), UserGroupType.PROJECT)) .filter(g -> StringUtils.equals(g.getType(), UserGroupType.PROJECT))
.map(Group::getId) .map(Group::getId)
.collect(Collectors.toList()); .collect(Collectors.toList());
return Objects.requireNonNull(SessionUtils.getUser()).getUserGroups().stream() return userDTO.getUserGroups().stream()
.filter(ur -> groupIds.contains(ur.getGroupId())) .filter(ur -> groupIds.contains(ur.getGroupId()))
.map(UserGroup::getSourceId) .map(UserGroup::getSourceId)
.collect(Collectors.toSet()); .collect(Collectors.toSet());