修复任务视图状态包含筛选

This commit is contained in:
whyour 2025-05-20 23:40:18 +08:00
parent 1a185f5682
commit eb1c00984c

View File

@ -215,14 +215,24 @@ export default class CronService {
operate2 = Op.and; operate2 = Op.and;
break; break;
case 'In': case 'In':
if (
property === 'status' &&
!value.includes(CrontabStatus.disabled)
) {
q[Op.and] = [
{ [property]: Array.isArray(value) ? value : [value] },
{ isDisabled: 0 },
];
} else {
q[Op.or] = [ q[Op.or] = [
{ {
[property]: Array.isArray(value) ? value : [value], [property]: Array.isArray(value) ? value : [value],
}, },
property === 'status' && value.includes(2) property === 'status' && value.includes(CrontabStatus.disabled)
? { isDisabled: 1 } ? { isDisabled: 1 }
: {}, : {},
]; ];
}
break; break;
case 'Nin': case 'Nin':
q[Op.and] = [ q[Op.and] = [