From b593afff62a46b295d2a4c510cae7dee6d9a1a9e Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 6 May 2024 14:17:04 +0800 Subject: [PATCH] * Adjust sql for trash get. --- module/action/model.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index 8d07a3b767..d5f18e1f3c 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -293,9 +293,8 @@ class actionModel extends model ->beginIF($objectType != 'all')->andWhere('objectType')->eq($objectType)->fi() ->beginIF($objectType == 'execution')->andWhere('objectID')->notIn($noMultipleExecutions)->fi() ->beginIF($objectType == 'all') - ->andWhere('objectType', true)->ne('exection') - ->markLeft(1) - ->orWhere('objectType')->eq('exection')->andWhere('objectID')->notIn($noMultipleExecutions) + ->andWhere('objectType', true)->ne('execution') + ->orWhere('(objectType')->eq('execution')->andWhere('objectID')->notIn($noMultipleExecutions) ->markRight(2) ->fi() ->andWhere('extra')->eq($extra)