From f6936b5ce883013aa52ca1d9d61f7f8e546bdb05 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Thu, 18 Apr 2024 16:22:44 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=85=A8=E9=80=89=E4=BC=A0=E5=80=BC=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1039613 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001039613 --- .../mapper/ExtFunctionalCaseMapper.xml | 4 +- .../system/service/NotificationService.java | 3 ++ .../components/caseTable.vue | 39 ++++++++++++++----- .../components/recycleCaseTable.vue | 22 ++++------- 4 files changed, 42 insertions(+), 26 deletions(-) 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 2420b533d8..f1cbcd1eaa 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 @@ -236,7 +236,7 @@ ) - + and functional_case.update_user in @@ -246,7 +246,7 @@ and functional_case.create_user in - + and functional_case.delete_user in diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java index 48e42bae9e..e283f0a4c6 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java @@ -109,6 +109,9 @@ public class NotificationService { public Integer getUnRead(String projectId) { NotificationExample example = new NotificationExample(); + if (StringUtils.isBlank(projectId)) { + return 0; + } example.createCriteria().andProjectIdEqualTo(projectId).andStatusEqualTo(NotificationConstants.Status.UNREAD.name()); return (int) notificationMapper.countByExample(example); } diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue index 97624d9e31..ba449cedf5 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue @@ -953,7 +953,6 @@ keyword: keyword.value, moduleIds, projectId: currentProjectId.value, - filter: { reviewStatus: statusFilters.value, caseLevel: caseFilters.value, @@ -961,11 +960,7 @@ updateUserName: updateUserFilters.value, createUserName: createUserFilters.value, }, - condition: { - keyword: keyword.value, - filter: propsRes.value.filter, - combine: batchParams.value.condition, - }, + combine: batchParams.value.condition, }; } // 获取父组件模块数量 @@ -1113,7 +1108,13 @@ excludeIds: batchParams.value?.excludeIds || [], condition: { keyword: keyword.value, - filter: propsRes.value.filter, + filter: { + reviewStatus: statusFilters.value, + caseLevel: caseFilters.value, + lastExecuteResult: executeResultFilters.value, + updateUserName: updateUserFilters.value, + createUserName: createUserFilters.value, + }, combine: batchParams.value.condition, }, projectId: currentProjectId.value, @@ -1192,7 +1193,13 @@ moduleIds: props.activeFolder === 'all' ? [] : [props.activeFolder, ...props.offspringIds], condition: { keyword: keyword.value, - filter: propsRes.value.filter, + filter: { + reviewStatus: statusFilters.value, + caseLevel: caseFilters.value, + lastExecuteResult: executeResultFilters.value, + updateUserName: updateUserFilters.value, + createUserName: createUserFilters.value, + }, combine: batchParams.value.condition, }, selectAll, @@ -1431,7 +1438,13 @@ condition: { keyword: keyword.value, searchMode: accordBelow, - filter: propsRes.value.filter, + filter: { + reviewStatus: statusFilters.value, + caseLevel: caseFilters.value, + lastExecuteResult: executeResultFilters.value, + updateUserName: updateUserFilters.value, + createUserName: createUserFilters.value, + }, combine, }, }; @@ -1575,7 +1588,13 @@ }, condition: { keyword: keyword.value, - filter: propsRes.value.filter, + filter: { + reviewStatus: statusFilters.value, + caseLevel: caseFilters.value, + lastExecuteResult: executeResultFilters.value, + updateUserName: updateUserFilters.value, + createUserName: createUserFilters.value, + }, combine: batchParams.value.condition, }, functionalDemandBatchRequest, diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue index 20c3a234e0..db8b0c1320 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue @@ -677,17 +677,16 @@ selectIds: batchParams.value.selectedIds, moduleIds: searchParams.value.moduleIds, projectId: currentProjectId.value, - filter: { - reviewStatus: statusFilters.value, - caseLevel: caseFilters.value, - lastExecuteResult: executeResultFilters.value, - updateUserName: updateUserFilters.value, - createUserName: createUserFilters.value, - deleteUserName: deleteUserFilters.value, - }, condition: { keyword: keyword.value, - filter: propsRes.value.filter, + filter: { + reviewStatus: statusFilters.value, + caseLevel: caseFilters.value, + lastExecuteResult: executeResultFilters.value, + updateUserName: updateUserFilters.value, + createUserName: createUserFilters.value, + deleteUserName: deleteUserFilters.value, + }, combine: batchParams.value.condition, }, }; @@ -714,11 +713,6 @@ createUserName: createUserFilters.value, deleteUserName: deleteUserFilters.value, }, - condition: { - keyword: keyword.value, - filter: propsRes.value.filter, - combine: batchParams.value.condition, - }, }; }