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

Merge branch 'release/21.7.5' into feature/workflowgroup

Browse Source
This commit is contained in:
sunguangming
2025-09-01 05:41:47 +00:00
parent 5661c39e58 171e4ee15d
commit ad5cf920d4
622 changed files with 20057 additions and 2716 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -5
View File
@@ -205,15 +205,16 @@ class actionModel extends model
*/
public function getList(string $objectType, array|int $objectID): array
{
$this->loadModel('file');
$this->loadModel('workflow');
$modules = $objectType == 'module' ? $this->dao->select('id')->from(TABLE_MODULE)->where('root')->in($objectID)->fetchPairs('id') : array();
$commiters = $this->loadModel('user')->getCommiters();
$actions = $this->actionTao->getActionListByTypeAndID($objectType, $objectID, $modules);
$histories = $this->getHistory(array_keys($actions));
$files = $this->file->groupByObjectID('comment', array_keys($actions));
$flowList = array();
if($objectType == 'project') $actions = $this->processProjectActions($actions);
$this->loadModel('file');
$this->loadModel('workflow');
foreach($actions as $actionID => $action)
{
$actionName = strtolower($action->action);
@@ -271,7 +272,7 @@ class actionModel extends model
}
$action->comment = $this->file->setImgSize($action->comment, $this->config->action->commonImgSize);
$action->files = $this->file->getByObject('comment', $actionID);
$action->files = !empty($files[$actionID]) ? $files[$actionID] : array();
$actions[$actionID] = $action;
}
return $actions;
@@ -1937,7 +1938,7 @@ class actionModel extends model
$beginAndEnd = $this->computeBeginAndEnd($period, '', $direction);
$hasProduct = preg_match('/t2\.(`?)product/', $condition);
$condition = preg_replace("/AND +`?date`? +(<|>|<=|>=) +'\d{4}\-\d{2}\-\d{2}'/", '', $condition);
$condition = preg_replace("/AND +`?date`?\s?(<|>|<=|>=)\s?'\d{4}\-\d{2}\-\d{2}'/", '', $condition);
$actions = $this->dao->select('action.id')->from(TABLE_ACTION)->alias('action')
->beginIF($hasProduct)->leftJoin(TABLE_ACTIONPRODUCT)->alias('t2')->on('action.id=t2.action')->fi()
->where($condition)