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

* Fix bug.

Browse Source
This commit is contained in:
leiyong
2020-12-07 09:50:03 +08:00
parent 475d9a5c27
commit d990666ee6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+4 -4
View File
@@ -1370,14 +1370,14 @@ class block extends control
$projectID = $this->session->PRJ;
$executions = $this->loadModel('project')->getExecutionPairs($projectID);
$products = $this->loadModel('product')->getPairs($projectID);
$count = isset($this->params->count) ? (int)$this->params->count : 10;
$products = $this->loadModel('product')->getProductPairsByProject($projectID);
$count = isset($this->params->count) ? (int)$this->params->count : 10;
$actions = array();
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->where('project')->eq($projectID)
->beginIF($executions)->markLeft()->orWhere('project')->in(array_keys($executions))->fi()->markRight()
->beginIF($products)->markLeft()->orWhere('product')->in(array_keys($products))->fi()->markRight()
->beginIF(!empty($executions))->markLeft()->orWhere('project')->in(array_keys($executions))->fi()->markRight()
->beginIF(!empty($products))->markLeft()->orWhere('product')->in(array_keys($products))->fi()->markRight()
->orderBy('date_desc')
->limit($count)
->fetchAll();