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 957703dbac..b921980200 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 @@ -1936,32 +1936,7 @@ public class IssuesService { } else { issueIds = Collections.EMPTY_LIST; } - - Map statusMap = customFieldIssuesService.getIssueStatusMap(issueIds, request.getProjectId()); - if (MapUtils.isEmpty(statusMap) && CollectionUtils.isNotEmpty(issueIds)) { - // 未找到自定义字段状态, 则获取平台状态 - IssuesRequest issuesRequest = new IssuesRequest(); - issuesRequest.setProjectId(SessionUtils.getCurrentProjectId()); - issuesRequest.setFilterIds(issueIds); - List issues = extIssuesMapper.getIssues(issuesRequest); - statusMap = issues.stream().collect(Collectors.toMap(IssuesDao::getId, i -> Optional.ofNullable(i.getPlatformStatus()).orElse("new"))); - } - - if (MapUtils.isEmpty(statusMap)) { - request.setFilterIds(issueIds); - } else { - if (request.getThisWeekUnClosedTestPlanIssue() || request.getUnClosedTestPlanIssue()) { - CustomField customField = baseCustomFieldService.getCustomFieldByName(SessionUtils.getCurrentProjectId(), SystemCustomField.ISSUE_STATUS); - JSONArray statusArray = JSONArray.parseArray(customField.getOptions()); - Map tmpStatusMap = statusMap; - List unClosedIds = issueIds.stream() - .filter(id -> !StringUtils.equals(tmpStatusMap.getOrDefault(id, StringUtils.EMPTY).replaceAll("\"", StringUtils.EMPTY), "closed")) - .collect(Collectors.toList()); - request.setFilterIds(unClosedIds); - } else { - request.setFilterIds(issueIds); - } - } + request.setFilterIds(issueIds); } public boolean thirdPartTemplateEnable(String projectId) {