diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java index 78446f9f27..4c004388af 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java @@ -71,7 +71,7 @@ public class FunctionalCaseLogService { requests.getId(), null, OperationLogType.UPDATE.name(), - OperationLogModule.FUNCTIONAL_CASE, + OperationLogModule.CASE_MANAGEMENT_CASE_UPDATE, requests.getName()); dto.setHistory(true); dto.setPath("/functional/case/update"); diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java index 3ba318c719..8f002b17a8 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java @@ -179,7 +179,7 @@ public class FunctionalCaseService { //记录日志 FunctionalCaseHistoryLogDTO historyLogDTO = getImportLogModule(functionalCase); - saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.ADD.name()); + saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.ADD.name(),OperationLogModule.CASE_MANAGEMENT_CASE_CREATE); return functionalCase; } @@ -962,7 +962,7 @@ public class FunctionalCaseService { List customFields = functionalCaseCustomFieldMapper.selectByExample(fieldExample); FunctionalCaseHistoryLogDTO historyLogDTO = new FunctionalCaseHistoryLogDTO(functionalCase, caseBlob, customFields, new ArrayList<>(), new ArrayList<>()); - saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.IMPORT.name()); + saveImportDataLog(functionalCase, new FunctionalCaseHistoryLogDTO(), historyLogDTO, userId, organizationId, OperationLogType.IMPORT.name(),OperationLogModule.CASE_MANAGEMENT_CASE_CREATE); } @@ -1071,7 +1071,7 @@ public class FunctionalCaseService { //记录新值 FunctionalCaseHistoryLogDTO modifiedLogDTO = getImportLogModule(functionalCase); //记录日志 - saveImportDataLog(functionalCase, originalValue, modifiedLogDTO, userId, organizationId, OperationLogType.IMPORT.name()); + saveImportDataLog(functionalCase, originalValue, modifiedLogDTO, userId, organizationId, OperationLogType.IMPORT.name(),OperationLogModule.CASE_MANAGEMENT_CASE_UPDATE); } private void handleUpdateCustomField(FunctionalCaseExcelData functionalCaseExcelData, String caseId, FunctionalCaseCustomFieldMapper customFieldMapper, Map customFieldsMap) { @@ -1089,14 +1089,14 @@ public class FunctionalCaseService { * @param originalValue 原值 * @param modifiedLogDTO 新值 */ - private void saveImportDataLog(FunctionalCase functionalCase, FunctionalCaseHistoryLogDTO originalValue, FunctionalCaseHistoryLogDTO modifiedLogDTO, String userId, String organizationId, String type) { + private void saveImportDataLog(FunctionalCase functionalCase, FunctionalCaseHistoryLogDTO originalValue, FunctionalCaseHistoryLogDTO modifiedLogDTO, String userId, String organizationId, String type,String module) { LogDTO dto = new LogDTO( functionalCase.getProjectId(), organizationId, functionalCase.getId(), userId, type, - OperationLogModule.FUNCTIONAL_CASE, + module, functionalCase.getName()); dto.setHistory(true); dto.setPath("/functional/case/import/excel"); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java b/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java index c7cd5ff9d8..2f7e700844 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java @@ -92,6 +92,9 @@ public class OperationLogModule { //用例 public static final String FUNCTIONAL_CASE = "CASE_MANAGEMENT_CASE"; + public static final String CASE_MANAGEMENT_CASE_CREATE = "CASE_MANAGEMENT_CASE_CREATE"; + public static final String CASE_MANAGEMENT_CASE_UPDATE = "CASE_MANAGEMENT_CASE_UPDATE"; + public static final String CASE_MANAGEMENT_CASE_RECYCLE = "CASE_MANAGEMENT_CASE_RECYCLE"; public static final String CASE_REVIEW = "CASE_MANAGEMENT_REVIEW"; diff --git a/frontend/src/config/pathMap.ts b/frontend/src/config/pathMap.ts index 44344f27f6..aa020ef958 100644 --- a/frontend/src/config/pathMap.ts +++ b/frontend/src/config/pathMap.ts @@ -375,13 +375,13 @@ export const pathMap: PathMapItem[] = [ permission: [], level: MENU_LEVEL[2], }, - { + /*{ key: 'PROJECT_MANAGEMENT_PERMISSION_VERSION', // 项目管理-项目与权限-项目版本 locale: 'project.permission.projectVersion', route: RouteEnum.PROJECT_MANAGEMENT_PERMISSION_VERSION, permission: [], level: MENU_LEVEL[2], - }, + },*/ { key: 'PROJECT_MANAGEMENT_PERMISSION_MEMBER', // 项目管理-项目与权限-成员 locale: 'project.permission.member', @@ -497,7 +497,7 @@ export const pathMap: PathMapItem[] = [ ], }, // 测试计划 - { + /*{ key: 'TEST_PLAN', // 测试计划 locale: 'menu.testPlan', route: RouteEnum.TEST_PLAN, @@ -512,7 +512,7 @@ export const pathMap: PathMapItem[] = [ level: MENU_LEVEL[2], }, ], - }, + },*/ { key: 'PERSONAL_INFORMATION', // 个人信息 locale: 'ms.personal',