From 88d212345b35d384e02c2feb744fc17d05f2f026 Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 24 Dec 2025 16:08:53 +0800 Subject: [PATCH] * [bug#68076,done,1h] Filter project change approval review action. --- module/my/model.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/my/model.php b/module/my/model.php index 24fa46216e..e7c50d6d72 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -1478,13 +1478,14 @@ class myModel extends model $condition = "(`action` = 'reviewed' or `action` = 'approvalreview')"; if($browseType == 'createdbyme') { - $condition = "(objectType in('story','case','feedback') and action = 'submitreview') OR "; + $condition = "objectType != 'projectchange' AND ("; + $condition .= "(objectType in('story','case','feedback') and action = 'submitreview') OR "; $condition .= "(objectType = 'review' and action = 'opened') OR "; $condition .= "(objectType = 'deploy' and action = 'created') OR "; $condition .= "(objectType = 'deploy' and action = 'submit') OR "; $condition .= "(objectType = 'attend' and action = 'commited') OR "; $condition .= "(`action` = 'approvalsubmit') OR "; - $condition .= "(objectType in('leave','makeup','overtime','lieu') and action = 'created')"; + $condition .= "(objectType in('leave','makeup','overtime','lieu') and action = 'created'))"; $condition = "($condition)"; } $actionIdList = $this->dao->select('MAX(`id`) as `id`')->from(TABLE_ACTION)