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

* Fix bug #34095.

Browse Source
This commit is contained in:
朱金勇
2023-04-14 01:24:17 +00:00
parent 85f42ed822
commit 1aa6861445
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/model.php
+7 -5
View File
@@ -1380,24 +1380,26 @@ class myModel extends model
if(empty($actionField)) $actionField = 'date';
$orderBy = $actionField . '_' . $direction;
$condition = "(action = 'reviewed' or action = 'approvalreview')";
$condition = "(`action` = 'reviewed' or `action` = 'approvalreview')";
if($browseType == 'createdbyme')
{
$condition = "(objectType in('story','case','feedback') and action = 'submitreview') OR ";
$condition .= "(objectType = 'review' and action = 'opened') OR ";
$condition .= "(objectType = 'attend' and action = 'commited') OR ";
$condition .= "(action = 'approvalsubmit') OR ";
$condition .= "(`action` = 'approvalsubmit') OR ";
$condition .= "(objectType in('leave','makeup','overtime','lieu') and action = 'created')";
$condition = "($condition)";
}
$actions = $this->dao->select('objectType,objectID,actor,action,MAX(`date`) as `date`,extra')->from(TABLE_ACTION)
$actionIdList = $this->dao->select('MAX(`id`) as `id`')->from(TABLE_ACTION)
->where('actor')->eq($this->app->user->account)
->andWhere('vision')->eq($this->config->vision)
->andWhere($condition)
->groupBy('objectType,objectID')
->orderBy($orderBy)
->page($pager, 'objectType,objectID')
->page($pager)
->fetchPairs();
$actions = $this->dao->select('objectType,objectID,actor,action,`date`,extra')->from(TABLE_ACTION)
->where('id')->in($actionIdList)
->fetchAll();
$objectTypeList = array();
foreach($actions as $action) $objectTypeList[$action->objectType][] = $action->objectID;