test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(项目设置): 修复操作日志已知缺陷 

--bug=1012882 --user=王孝刚 【系统设置】操作日志问题汇总
https://www.tapd.cn/55049933/s/1151175
--bug=1012874 --user=王孝刚
【系统设置】github#13126，工作空间和项目设置的操作日志，通过添加操作对象搜索条件，无法正确查出对应数据
https://www.tapd.cn/55049933/s/1151197
This commit is contained in:
wxg0103 2022-04-28 18:17:26 +08:00 committed by 刘瑞斌
parent ecf43fc120
commit 0a02d654ae
3 changed files with 380 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.xml
View File

@ -33,7 +33,8 @@
or t.project_id = ""
)
<if test="request.operUser != null and request.operUser != ''">
and (t.oper_user like #{request.operUser, jdbcType=VARCHAR} or t1.name like #{request.operUser, jdbcType=VARCHAR})
and (t.oper_user like #{request.operUser, jdbcType=VARCHAR} or t1.name like
#{request.operUser, jdbcType=VARCHAR})
</if>
<if test="request.projectId != null and request.projectId !=''">
and t.project_id = #{request.projectId}
@ -42,7 +43,10 @@
and t.oper_type like #{request.operType, jdbcType=VARCHAR}
</if>
<if test="request.operModule != null and request.operModule != ''">
and t.oper_module like #{request.operModule, jdbcType=VARCHAR}
and
<foreach collection="request.operModule" index="index" open="(" close=")" separator="or" item="item">
t.oper_module like CONCAT('%',#{item},'%')
</foreach>
</if>
<if test="request.startTime != null and request.endTime != null">
AND t.oper_time BETWEEN #{request.startTime} AND #{request.endTime}

2
backend/src/main/java/io/metersphere/log/vo/OperatingLogRequest.java
View File

@ -22,7 +22,7 @@ public class OperatingLogRequest implements Serializable {
private Long endTime;
private String operModule;
private List<String> operModule;
private String operTitle;

92
frontend/src/business/components/settings/operatinglog/config.js
View File

@ -103,33 +103,46 @@ export function SYSLIST() {
label: i18n.t('test_track.test_track'), value: i18n.t('test_track.test_track'), children: [
{
label: i18n.t('permission.project_track_case.name'),
value: i18n.t('permission.project_track_case.name'),
value: [i18n.t('permission.project_track_case.name'), 'TRACK_TEST_CASE'],
leaf: true
},
{
label: i18n.t('test_track.review.test_review'),
value: [i18n.t('test_track.review.test_review'), 'TRACK_TEST_CASE_REVIEW'],
leaf: true
},
{
label: i18n.t('test_track.plan.test_plan'),
value: [i18n.t('test_track.plan.test_plan'), 'TRACK_TEST_PLAN'],
leaf: true
},
{label: i18n.t('test_track.review.test_review'), value: i18n.t('test_track.review.test_review'), leaf: true},
{label: i18n.t('test_track.plan.test_plan'), value: i18n.t('test_track.plan.test_plan'), leaf: true},
{
label: i18n.t('test_track.issue.issue_management'),
value: i18n.t('test_track.issue.issue_management'),
value: [i18n.t('test_track.issue.issue_management'), 'TRACK_BUG'],
leaf: true
},
{label: i18n.t('commons.report'), value: i18n.t('commons.report'), leaf: true}]
{label: i18n.t('commons.report'), value: [i18n.t('commons.report'), 'TRACK_REPORT'], leaf: true}]
},
{
label: i18n.t('commons.api'), value: i18n.t('commons.api'), children: [
{
label: i18n.t('workstation.table_name.api_definition'),
value: i18n.t('workstation.table_name.api_definition'),
value: [i18n.t('workstation.table_name.api_definition'), 'API_DEFINITION'],
leaf: true
},
{
label: i18n.t('operating_log.api_definition_case'),
value: [i18n.t('operating_log.api_definition_case'), 'API_DEFINITION_CASE'],
leaf: true
},
{
label: i18n.t('workstation.table_name.api_automation'),
value: i18n.t('workstation.table_name.api_automation'),
value: [i18n.t('workstation.table_name.api_automation'), 'API_AUTOMATION'],
leaf: true
},
{
label: i18n.t('permission.project_api_report.name'),
value: i18n.t('permission.project_api_report.name'),
value: [i18n.t('permission.project_api_report.name'), 'API_AUTOMATION_REPORT'],
leaf: true
}]
},
@ -139,100 +152,107 @@ export function SYSLIST() {
children: [
{
label: i18n.t('workstation.table_name.performance'),
value: i18n.t('workstation.table_name.performance'),
value: [i18n.t('workstation.table_name.performance'), 'PERFORMANCE_TEST'],
leaf: true
},
{label: i18n.t('report.load_test_report'), value: i18n.t('report.load_test_report'), leaf: true}]
{
label: i18n.t('report.load_test_report'),
value: [i18n.t('report.load_test_report'), 'PERFORMANCE_TEST_REPORT'],
leaf: true
}]
},
{
label: i18n.t('commons.system_setting'), value: i18n.t('commons.system_setting'), children: [
{
label: i18n.t('commons.system') + "-" + i18n.t('commons.user'),
value: i18n.t('commons.system') + "-" + i18n.t('commons.user'),
value: [i18n.t('commons.system') + "-" + i18n.t('commons.user'), 'SYSTEM_USER'],
leaf: true
},
{
label: i18n.t('commons.system') + "-" + i18n.t('commons.test_resource_pool'),
value: i18n.t('commons.system') + "-" + i18n.t('commons.test_resource_pool'),
value: [i18n.t('commons.system') + "-" + i18n.t('commons.test_resource_pool'), 'SYSTEM_TEST_RESOURCE'],
leaf: true
},
{
label: i18n.t('commons.system') + "-" + i18n.t('commons.system_parameter_setting'),
value: i18n.t('commons.system') + "-" + i18n.t('commons.system_parameter_setting'),
value: [i18n.t('commons.system') + "-" + i18n.t('commons.system_parameter_setting'), 'SYSTEM_PARAMETER_SETTING'],
leaf: true
},
{
label: i18n.t('commons.system') + "-" + i18n.t('commons.quota'),
value: i18n.t('commons.system') + "-" + i18n.t('commons.quota'),
value: [i18n.t('commons.system') + "-" + i18n.t('commons.quota'), 'SYSTEM_QUOTA_MANAGEMENT'],
leaf: true
},
{
label: i18n.t('commons.system') + "-" + i18n.t('license.title'),
value: i18n.t('commons.system') + "-" + i18n.t('license.title'),
value: [i18n.t('commons.system') + "-" + i18n.t('license.title'), 'SYSTEM_AUTHORIZATION_MANAGEMENT'],
leaf: true
},
{label: i18n.t('commons.workspace'), value: i18n.t('commons.workspace'), leaf: true},
{
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_service.name'),
value: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_service.name'),
label: i18n.t('commons.workspace'),
value: [i18n.t('commons.workspace'), 'SYSTEM_WORKSPACE'],
leaf: true
},
{
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_message.name'),
value: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_message.name'),
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_service.name'),
value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_service.name'), 'WORKSPACE_SERVICE_INTEGRATION'],
leaf: true
},
{
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_message.name'),
value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_message.name'), 'WORKSPACE_MESSAGE_SETTINGS'],
leaf: true
},
{
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_user.name'),
value: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_user.name'),
value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_user.name'), 'WORKSPACE_MEMBER'],
leaf: true
},
{
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_template.name'),
value: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_template.name'),
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_template.name'),
value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_template.name'), 'WORKSPACE_TEMPLATE_SETTINGS_CASE'],
leaf: true
},
{
label: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_project_manager.name'),
value: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_project_manager.name'),
leaf: true
},
{
label: i18n.t('commons.project') + "-" + i18n.t('project.manager'),
value: i18n.t('commons.project') + "-" + i18n.t('project.manager'),
value: [i18n.t('commons.project') + "-" + i18n.t('project.manager'), 'PROJECT_PROJECT_MANAGER'],
leaf: true
},
{
label: i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'),
value: i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'),
value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'), 'PROJECT_PROJECT_MEMBER'],
leaf: true
},
{
label: i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'),
value: i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'),
value: [i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'), 'PROJECT_PROJECT_JAR'],
leaf: true
},
{
label: i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'),
value: i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'),
value: [i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'), 'PROJECT_ENVIRONMENT_SETTING'],
leaf: true
},
{
label: i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'),
value: i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'),
value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'), 'PROJECT_FILE_MANAGEMENT'],
leaf: true
},
{
label: i18n.t('commons.personal_information') + "-" + i18n.t('commons.personal_setting'),
value: i18n.t('commons.personal_information') + "-" + i18n.t('commons.personal_setting'),
value: [i18n.t('commons.personal_information') + "-" + i18n.t('commons.personal_setting'), 'PERSONAL_INFORMATION_PERSONAL_SETTINGS'],
leaf: true
},
{
label: i18n.t('commons.personal_information') + "-API Keys",
value: i18n.t('commons.personal_information') + "-API Keys",
value: [i18n.t('commons.personal_information') + "-API Keys", 'PERSONAL_INFORMATION_APIKEYS'],
leaf: true
},
{
label: i18n.t('operating_log.auth_title'),
value: [i18n.t('operating_log.auth_title'), 'AUTH_TITLE'],
leaf: true
}
]