diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java index 4643b13bb7..399dae3263 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java @@ -42,7 +42,7 @@ public class FunctionalCaseTrashController { @CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project") public Pager> getFunctionalCasePage(@Validated @RequestBody FunctionalCasePageRequest request) { Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), - StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "delete_time desc"); + StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "delete_time desc, id asc"); return PageUtils.setPageInfo(page, functionalCaseService.getFunctionalCasePage(request, true)); } diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue index 2776487aa1..31e7b12849 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue @@ -370,6 +370,7 @@ 'showTooltip': true, 'ellipsis': true, 'showDrag': false, + 'columnSelectorDisabled': true, }, { title: 'caseManagement.featureCase.tableColumnName', @@ -384,6 +385,7 @@ }, ellipsis: true, showDrag: false, + columnSelectorDisabled: true, }, { title: 'caseManagement.featureCase.tableColumnLevel',