diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml index b814a3f4e5..e1791eefdb 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml @@ -45,6 +45,7 @@ and ch.review_id = #{reviewId} + order by ch.create_time desc diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java index c8542be70a..5c575e339e 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java @@ -36,7 +36,7 @@ public class FunctionalCaseReviewService { } public List getCaseReviewHistory(String caseId) { - List list = extCaseReviewHistoryMapper.list(caseId, null); + List list = extCaseReviewHistoryMapper.getHistoryListWidthAbandoned(caseId, null); for (CaseReviewHistoryDTO caseReviewHistoryDTO : list) { if (StringUtils.equalsIgnoreCase(caseReviewHistoryDTO.getCreateUser(), "system")) { caseReviewHistoryDTO.setUserName(Translator.get("case_review_history.system")); diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/ReviewFunctionalCaseService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/ReviewFunctionalCaseService.java index 05a2dfd37c..7e55821463 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/ReviewFunctionalCaseService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/ReviewFunctionalCaseService.java @@ -213,6 +213,6 @@ public class ReviewFunctionalCaseService { caseReviewHistoryDTO.setContentText(new String(caseReviewHistoryDTO.getContent(), StandardCharsets.UTF_8)); } } - return list.stream().sorted(Comparator.comparing(CaseReviewHistoryDTO::getCreateTime).reversed()).toList(); + return list; } }