diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml index 8f6291bb8c..2189b26ab1 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml @@ -113,6 +113,8 @@ functional_case.update_time, functional_case.review_status, functional_case.last_execute_result, + functional_case.delete_user, + functional_case.delete_time, functional_case.tags FROM functional_case diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java index e59e47797c..e8ed0dc3b7 100644 --- a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java +++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java @@ -457,6 +457,7 @@ public class FileMetadataService { FileManagementQuery myFileCountDTO = new FileManagementQuery(); myFileCountDTO.setProjectId(request.getProjectId()); myFileCountDTO.setStorage(null); + myFileCountDTO.setHiddenIds(pageDTO.getHiddenIds()); long allCount = extFileMetadataMapper.fileCount(myFileCountDTO); myFileCountDTO.setOperator(operator); long myFileCount = extFileMetadataMapper.fileCount(myFileCountDTO); diff --git a/frontend/src/components/business/ms-link-file/linkFileTable.vue b/frontend/src/components/business/ms-link-file/linkFileTable.vue index cea61a2f56..79bf215541 100644 --- a/frontend/src/components/business/ms-link-file/linkFileTable.vue +++ b/frontend/src/components/business/ms-link-file/linkFileTable.vue @@ -50,27 +50,27 @@