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

* [refac bug #61110] Fix error.

Browse Source
This commit is contained in:
wangyidong
2025-04-07 15:00:02 +08:00
committed by 刘刚
parent 26c01e8fe4
commit 85754392e1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/tao.php
+4
View File
@@ -506,6 +506,8 @@ class storyTao extends storyModel
*/
protected function fetchExecutionStories(dao $storyDAO, int $productID, string $type, string $branch, string $orderBy, object|null $pager = null): array
{
if(strpos($orderBy, 'version_') !== false) $orderBy = str_replace('version_', 't2.version_', $orderBy);
$browseType = $this->session->executionStoryBrowseType;
$unclosedStatus = $this->getUnclosedStatusKeys();
return $storyDAO->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
@@ -534,6 +536,8 @@ class storyTao extends storyModel
*/
protected function fetchProjectStories(dao $storyDAO, int $productID, string $type, string $branch, array $executionStoryIdList, string $orderBy, object|null $pager = null, object|null $project = null): array
{
if(strpos($orderBy, 'version_') !== false) $orderBy = str_replace('version_', 't2.version_', $orderBy);
$unclosedStatus = $this->getUnclosedStatusKeys();
return $storyDAO->beginIF(!empty($productID) && (!$project->charter || ($project->charter && $project->hasProduct)))->andWhere('t1.product')->eq($productID)->fi()
->beginIF($type == 'bybranch' and $branch !== '')->andWhere('t2.branch')->in("0,$branch")->fi()