fix(接口测试): 修复任务中心页面筛选项目报错的缺陷

--bug=1039442 --user=王孝刚
【系统/组织任务中心】实时任务列表-所属组织下拉筛选&实时任务列表-所属项目下拉筛选报服务器错误
https://www.tapd.cn/55049933/s/1498184
This commit is contained in:
wxg0103 2024-04-16 12:08:14 +08:00 committed by Craftsman
parent 9b496fffcd
commit 22e76da348
5 changed files with 32 additions and 6 deletions

View File

@ -142,7 +142,7 @@
and api_report.update_user in
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
</when>
<when test="key=='projectIds">
<when test="key=='projectIds'">
and api_report.project_id in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}

View File

@ -268,7 +268,7 @@
and api_scenario_report.update_user in
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
</when>
<when test="key=='projectIds">
<when test="key=='projectIds'">
and api_scenario_report.project_id in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}

View File

@ -68,7 +68,7 @@
and task.resource_type in
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
</when>
<when test="key=='projectIds">
<when test="key=='projectIds'">
and task.project_id in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}

View File

@ -495,8 +495,18 @@
try {
const { selectIds, selectAll } = batchParams.value;
await loadRealMap.value[props.group].batchStop({
moduleType: props.moduleType,
selectIds: selectAll ? [] : selectIds,
selectAll,
condition: {
keyword: keyword.value,
filter: {
status: statusFiltersMap.value[props.moduleType],
triggerMode: triggerModeFiltersMap.value[props.moduleType],
organizationIds: orgFiltersMap.value[props.moduleType],
projectIds: projectFiltersMap.value[props.moduleType],
},
},
});
resetSelector();
Message.success(t('project.taskCenter.stopSuccess'));
@ -511,7 +521,7 @@
}
function handleTableBatch(event: BatchActionParams, params: BatchActionQueryParams) {
batchParams.value = { ...params, selectIds: params?.selectedIds || [], condition: {} };
batchParams.value = { ...params, selectIds: params?.selectedIds || [], condition: params?.condition || {} };
if (event.eventTag === 'batchStop') {
batchStopRealTask();
}

View File

@ -375,8 +375,10 @@
setLoadListParams({
keyword: keyword.value,
scheduleTagType: props.moduleType,
organizationIds: orgFiltersMap.value[props.moduleType],
projectIds: projectFiltersMap.value[props.moduleType],
filter: {
organizationIds: orgFiltersMap.value[props.moduleType],
projectIds: projectFiltersMap.value[props.moduleType],
},
});
loadList();
}
@ -501,6 +503,13 @@
selectAll,
scheduleTagType: props.moduleType,
excludeIds,
condition: {
keyword: keyword.value,
filter: {
organizationIds: orgFiltersMap.value[props.moduleType],
projectIds: projectFiltersMap.value[props.moduleType],
},
},
});
resetSelector();
Message.success(t('project.taskCenter.enableSuccess'));
@ -531,6 +540,13 @@
selectIds: selectAll ? [] : selectIds,
selectAll,
scheduleTagType: props.moduleType,
condition: {
keyword: keyword.value,
filter: {
organizationIds: orgFiltersMap.value[props.moduleType],
projectIds: projectFiltersMap.value[props.moduleType],
},
},
});
resetSelector();
Message.success(t('project.taskCenter.disableSuccess'));