diff --git a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java index f42f5fa897..5b7298655f 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java @@ -432,6 +432,13 @@ public class IssuesService { ServiceUtils.getDefaultOrder(issueRequest.getOrders()); issueRequest.setRefType(refType); List issues = extIssuesMapper.getIssuesByCaseId(issueRequest); + Map userMap = getUserMap(issues); + issues.forEach(issue -> { + User user = userMap.get(issue.getCreator()); + if (user != null) { + issue.setCreatorName(user.getName()); + } + }); handleCustomFieldStatus(issues); return DistinctKeyUtil.distinctByKey(issues, IssuesDao::getId); } @@ -1199,7 +1206,16 @@ public class IssuesService { } public List relateList(IssuesRequest request) { - return extIssuesMapper.getIssues(request); + List issues = extIssuesMapper.getIssues(request); + Map userMap = getUserMap(issues); + issues.forEach(issue -> { + User user = userMap.get(issue.getCreator()); + if (user != null) { + issue.setCreatorName(user.getName()); + } + }); + handleCustomFieldStatus(issues); + return issues; } public void userAuth(AuthUserIssueRequest authUserIssueRequest) { diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue index 6b7a7079ce..c310689503 100644 --- a/test-track/frontend/src/business/case/components/TestCaseList.vue +++ b/test-track/frontend/src/business/case/components/TestCaseList.vue @@ -212,7 +212,6 @@ - diff --git a/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue b/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue index 93f8be7cb0..7282f44280 100644 --- a/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue +++ b/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue @@ -88,7 +88,7 @@ {{ scope.row.platformStatus ? tapdIssueStatusMap[scope.row.platformStatus] : '--' }} - {{ scope.row.platformStatus ? tapdIssueStatusMap[scope.row.platformStatus] : '--' }} + {{ '--' }} {{ platformStatusMap.get(scope.row.platformStatus) }} @@ -100,21 +100,6 @@ - - - - + + + @@ -217,7 +209,7 @@ export default { MsTableColumn, MsTable, TestPlanIssueEdit, - MsNewUiSearch, + MsNewUiSearch }, data() { return { @@ -239,6 +231,8 @@ export default { status: [], issueRelateVisible: false, condition: {}, + platformStatus: [], + platformStatusMap: new Map(), }; }, props: { diff --git a/test-track/frontend/src/business/case/components/case/CaseIssueRelateList.vue b/test-track/frontend/src/business/case/components/case/CaseIssueRelateList.vue index e6c72a0a92..feb0bb7e77 100644 --- a/test-track/frontend/src/business/case/components/case/CaseIssueRelateList.vue +++ b/test-track/frontend/src/business/case/components/case/CaseIssueRelateList.vue @@ -44,64 +44,84 @@ class="relate-issue-table" ref="table" > - - - - + + + + + - - + + - - + - - - + + - - + + + + + -