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

* [bug#54048,done,1h] Not show shadow build in the build list.

Browse Source
This commit is contained in:
xieqiyu
2024-08-16 14:43:55 +08:00
committed by 唐胡成
parent 93179d49ad
commit 5d05d5ccbf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/model.php
+3 -1
View File
@@ -67,11 +67,13 @@ class buildModel extends model
*/
public function getProjectBuilds(int $projectID = 0, string $type = 'all', string $param = '', string $orderBy = 't1.date_desc,t1.id_desc', object $pager = null): array
{
$builds = $this->dao->select('t1.*, t2.name as productName')
$shadows = $this->dao->select('shadow')->from(TABLE_RELEASE)->where("FIND_IN_SET({$projectID}, project)")->fetchPairs('shadow', 'shadow');
$builds = $this->dao->select('t1.*, t2.name as productName')
->from(TABLE_BUILD)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t1.project')->ne(0)
->andWhere('t1.id')->notIN($shadows)
->beginIF($projectID)->andWhere('t1.project')->eq((int)$projectID)->fi()
->beginIF($type == 'product' && $param)->andWhere('t1.product')->eq((int)$param)->fi()
->beginIF($type == 'bysearch')->andWhere($param)->fi()