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

* Merge 18.x

Browse Source
This commit is contained in:
zenggang
2023-08-28 10:27:22 +00:00
parent fdd027a824 d8bc8ec4b0
commit 29f2f5187b
324 changed files with 17288 additions and 4829 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+1 -3
View File
@@ -1100,9 +1100,7 @@ class treeModel extends model
$paths = $this->dao->select('DISTINCT t3.' . $field)->from($table1)->alias('t1')
->leftJoin($table2)->alias('t2')->on('t1.' . $linkObject . ' = t2.id')
->leftJoin(TABLE_MODULE)->alias('t3')->on('t2.module = t3.id')
->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project = t4.id')
->where('(t1.project')->eq($executionID)
->orWhere('t4.project')->eq($executionID)->markRight(1)
->where('t1.project')->eq($executionID)
->andWhere('t3.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->beginIF(isset($extra['branchID']) and $branch !== 'all')->andWhere('t2.branch')->eq($branch)->fi()