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

fix(测试跟踪): 测试评审打开用例报错

This commit is contained in:
AgAngle 2024-06-12 11:53:18 +08:00 committed by 刘瑞斌
parent edcb46a44c
commit 8ce127cfc5
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/ExtCheckOwnerMapper.xml
View File

@ -4,12 +4,14 @@
<select id="checkoutOwner" resultType="boolean"> <select id="checkoutOwner" resultType="boolean">
SELECT count(1) > 0 SELECT count(1) > 0
FROM user_group FROM user_group
WHERE source_id IN (SELECT project_id WHERE source_id IN (
SELECT project_id
FROM ${table} JOIN project ON ${table}.project_id = project.id FROM ${table} JOIN project ON ${table}.project_id = project.id
WHERE ${table}.id IN WHERE ${table}.id IN
<foreach collection="ids" item="id" separator="," open="(" close=")"> <foreach collection="ids" item="id" separator="," open="(" close=")">
#{id} #{id}
</foreach>) </foreach>
)
AND user_id = #{userId} AND user_id = #{userId}
</select> </select>

2
test-track/backend/src/main/java/io/metersphere/controller/TestReviewTestCaseController.java
View File

@ -104,7 +104,7 @@ public class TestReviewTestCaseController {
@GetMapping("/get/{reviewId}") @GetMapping("/get/{reviewId}")
@RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ) @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ)
public TestReviewCaseDTO get(@PathVariable String reviewId) { public TestReviewCaseDTO get(@PathVariable String reviewId) {
return testReviewTestCaseService.get(reviewId, SessionUtils.getCurrentProjectId()); return testReviewTestCaseService.get(reviewId, SessionUtils.getUserId());
} }
@GetMapping("/reviewer/status/{id}") @GetMapping("/reviewer/status/{id}")

8
test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
View File

@ -459,9 +459,9 @@ public class TestReviewTestCaseService {
return comments; return comments;
} }
public TestReviewCaseDTO get(String testReviewTestCaseId, String currentProjectId) { public TestReviewCaseDTO get(String testReviewTestCaseId, String currentUserId) {
TestReviewCaseDTO testReviewCaseDTO = extTestReviewCaseMapper.get(testReviewTestCaseId); TestReviewCaseDTO testReviewCaseDTO = extTestReviewCaseMapper.get(testReviewTestCaseId);
checkReviewCaseOwner(testReviewCaseDTO.getCaseId(), currentProjectId); checkReviewCaseOwner(testReviewCaseDTO.getCaseId(), currentUserId);
testReviewCaseDTO.setFields(testCaseService.getCustomFieldByCaseId(testReviewCaseDTO.getCaseId())); testReviewCaseDTO.setFields(testCaseService.getCustomFieldByCaseId(testReviewCaseDTO.getCaseId()));
return testReviewCaseDTO; return testReviewCaseDTO;
} }
@ -881,8 +881,8 @@ public class TestReviewTestCaseService {
} }
} }
private void checkReviewCaseOwner(String caseId, String currentProjectId) { private void checkReviewCaseOwner(String caseId, String currentUserId) {
boolean hasPermission = extCheckOwnerMapper.checkoutOwner("test_case", currentProjectId, List.of(caseId)); boolean hasPermission = extCheckOwnerMapper.checkoutOwner("test_case", currentUserId, List.of(caseId));
if (!hasPermission) { if (!hasPermission) {
MSException.throwException(Translator.get("check_owner_case")); MSException.throwException(Translator.get("check_owner_case"));
} }