This commit is contained in:
wangyidong
2024-01-31 10:09:39 +08:00
parent 218cde61bc
commit fac873359b
2 changed files with 8 additions and 6 deletions
+7 -5
View File
@@ -381,13 +381,15 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC
foreach($stories as $story)
{
$story->moduleID = $story->module;
$story = $this->story->formatStoryForList($story, $options);
if($story->parent > 0)
$data[] = $this->story->formatStoryForList($story, $options, $storyType);
if(!isset($story->children)) continue;
/* Children. */
foreach($story->children as $key => $child)
{
$story->parent = 0;
$story->isChild = true;
$child->moduleID = $child->module;
$data[] = $this->story->formatStoryForList($child, $options, $storyType);
}
$data[] = $story;
}
jsVar('cases', $storyCases);
+1 -1
View File
@@ -233,7 +233,7 @@ class storyModel extends model
/* 格式化参数。 */
$orderBy = str_replace('branch_', 't2.branch_', $orderBy);
$type = strtolower($type);
if(is_string($excludeStories))$excludeStories = explode(',', $excludeStories);
if(is_string($excludeStories)) $excludeStories = explode(',', $excludeStories);
/* 获取需求。 */
if($type == 'bysearch') $stories = $this->storyTao->getExecutionStoriesBySearch($executionID, (int)$param, $productID, $orderBy, $storyType, $excludeStories, $pager);