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

fix(测试跟踪): 超管无法查看测试计划功能用例详情 

--bug=1040309 --user=陈建星 [测试跟踪] github #30599超级管理员角色执行功能用例，没有更新执行人 https://www.tapd.cn/55049933/s/1601913
This commit is contained in:
AgAngle 2024-10-30 11:57:42 +08:00 committed by Craftsman
parent 8dd9bc8354
commit b92ed2ab07
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test-track/backend/src/main/java/io/metersphere/controller/TestPlanTestCaseController.java
View File

@ -102,7 +102,9 @@ public class TestPlanTestCaseController {
@GetMapping("/get/{caseId}")
@RequiresPermissions(PermissionConstants.PROJECT_TRACK_PLAN_READ)
public TestPlanCaseDTO getTestPlanCases(@PathVariable String caseId) {
return testPlanTestCaseService.get(caseId, SessionUtils.getUserId());
TestPlanCaseDTO testPlanCaseDTO = testPlanTestCaseService.get(caseId);
testPlanTestCaseService.checkPlanCaseOwner(testPlanCaseDTO.getCaseId(), SessionUtils.getUser(), SessionUtils.getUserId());
return testPlanCaseDTO;
}
@PostMapping("recent/{count}")

13
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanTestCaseService.java
View File

@ -11,6 +11,7 @@ import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
import io.metersphere.commons.constants.IssueRefType;
import io.metersphere.commons.constants.MicroServiceName;
import io.metersphere.commons.constants.ProjectApplicationType;
import io.metersphere.commons.constants.UserGroupConstants;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.user.SessionUser;
import io.metersphere.commons.utils.*;
@ -309,9 +310,8 @@ public class TestPlanTestCaseService {
request.setExecutor(user.getId());
}
public TestPlanCaseDTO get(String id, String userId) {
public TestPlanCaseDTO get(String id) {
TestPlanCaseDTO testPlanCaseDTO = extTestPlanTestCaseMapper.get(id);
checkPlanCaseOwner(testPlanCaseDTO.getCaseId(), userId);
ServiceUtils.buildCustomNumInfo(testPlanCaseDTO);
List<TestCaseTestDTO> testCaseTestDTOS = extTestPlanTestCaseMapper.listTestCaseTest(testPlanCaseDTO.getCaseId());
testCaseTestDTOS.forEach(this::setTestName);
@ -668,7 +668,14 @@ public class TestPlanTestCaseService {
return updateIsDel(caseIds, false);
}
private void checkPlanCaseOwner(String caseId, String userId) {
public void checkPlanCaseOwner(String caseId, SessionUser sessionUser, String userId) {
long count = sessionUser.getGroups()
.stream()
.filter(g -> StringUtils.equals(g.getId(), UserGroupConstants.SUPER_GROUP))
.count();
if (count > 0) {
return;
}
boolean hasPermission = extCheckOwnerMapper.checkoutOwner("test_case", userId, List.of(caseId));
if (!hasPermission) {
MSException.throwException(Translator.get("check_owner_case"));