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

Merge branch 'release/21.7.8' into release/22.0.alpha1

Browse Source
This commit is contained in:
sunguangming
2025-12-29 07:52:33 +00:00
parent 5523416ed7 0109f278aa
commit e0e06d9ca3
268 changed files with 2652 additions and 1693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+2 -2
View File
@@ -2842,14 +2842,14 @@ class projectModel extends model
$bug = $this->dao->select('id')->from(TABLE_BUG)->where('execution')->eq($executionID)->andWhere('deleted')->eq(0)->limit(1)->fetch();
if(!empty($bug)) return true;
$story = $this->dao->select('id')->from(TABLE_STORY)->alias('t1')
$story = $this->dao->select('t1.id')->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id=t2.story')
->where('t2.project')->eq($executionID)
->andWhere('t1.deleted')->eq(0)
->limit(1)->fetch();
if(!empty($story)) return true;
$case = $this->dao->select('id')->from(TABLE_CASE)->alias('t1')
$case = $this->dao->select('t1.id')->from(TABLE_CASE)->alias('t1')
->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id=t2.case')
->where('t2.project')->eq($executionID)
->andWhere('t1.deleted')->eq(0)