Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch dev/bug-68076 of zentao/zentaopms (#13011)

Browse Source
This commit is contained in:
刘刚
2025-12-25 14:16:55 +08:00
committed by Gitfox
parent cb1510986e f303c522ac
commit 31c3ad3f1e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/model.php
+3 -2
View File
@@ -1483,13 +1483,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)