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

* Finish task #36436.

Browse Source
This commit is contained in:
Yagami
2021-03-10 13:43:28 +08:00
parent 86055e545f
commit 1082a2425f
21 changed files with 100 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -4
View File
@@ -555,16 +555,16 @@ class execution extends control
$products = $this->dao->select('t1.product, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')
->on('t1.product = t2.id')
->where('t1.execution')->eq($executionID)
->where('t1.project')->eq($executionID)
->fetchPairs('product');
if(!empty($products))
{
unset($executions);
$executions = $this->dao->select('t1.execution, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
$executions = $this->dao->select('t1.project, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')
->on('t1.execution = t2.id')
->on('t1.project = t2.id')
->where('t1.product')->in(array_keys($products))
->fetchPairs('execution');
->fetchPairs('project');
}
else
{