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

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
Captain.B 2020-10-22 17:53:49 +08:00
parent ba0bc4dded 6e4a8f1ab4
commit dd8d52a32d
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
View File

@ -360,9 +360,16 @@ public class TestCaseReviewService {
public void testReviewRelevance(ReviewRelevanceRequest request) { public void testReviewRelevance(ReviewRelevanceRequest request) {
String reviewId = request.getReviewId(); String reviewId = request.getReviewId();
List<String> userIds = getTestCaseReviewerIds(reviewId); List<String> userIds = getTestCaseReviewerIds(reviewId);
String creator = "";
TestCaseReview review = testCaseReviewMapper.selectByPrimaryKey(reviewId);
if (review != null) {
creator = review.getCreator();
}
String currentId = SessionUtils.getUser().getId(); String currentId = SessionUtils.getUser().getId();
if (!userIds.contains(currentId)) { if (!userIds.contains(currentId) && !StringUtils.equals(creator, currentId)) {
MSException.throwException("非用例评审人员，不能关联用例！"); MSException.throwException("没有权限，不能关联用例！");
} }
List<String> testCaseIds = request.getTestCaseIds(); List<String> testCaseIds = request.getTestCaseIds();

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

@ -87,8 +87,13 @@ public class TestReviewTestCaseService {
private void checkReviewer(String reviewId) { private void checkReviewer(String reviewId) {
List<String> userIds = testCaseReviewService.getTestCaseReviewerIds(reviewId); List<String> userIds = testCaseReviewService.getTestCaseReviewerIds(reviewId);
String currentId = SessionUtils.getUser().getId(); String currentId = SessionUtils.getUser().getId();
if (!userIds.contains(currentId)) { TestCaseReview caseReview = testCaseReviewMapper.selectByPrimaryKey(reviewId);
MSException.throwException("非用例评审人员，不能解除用例关联！"); String creator = "";
if (caseReview != null) {
creator = caseReview.getCreator();
}
if (!userIds.contains(currentId) && !StringUtils.equals(creator, currentId)) {
MSException.throwException("没有权限，不能解除用例关联！");
} }
} }