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

* Adjust codes.

Browse Source
This commit is contained in:
caoyanyi
2022-04-02 14:03:23 +08:00
parent 6f7e2000d3
commit 59efd44767
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+6 -6
View File
@@ -2332,21 +2332,21 @@ class story extends control
/* Get users, products and relations. */
$users = $this->loadModel('user')->getPairs('noletter');
$products = $this->product->getPairs('nocode');
$relations = $this->story->getStoryRelationByIDs($storyIdList, $type);
$relations = $this->story->getStoryRelationByIds($storyIdList, $type);
/* Get related objects id lists. */
$relatedProductIdList = array();
$relatedStoryIdList = array();
$relatedPlanIdList = array();
$relatedBranchIdList = array();
$relatedStoryIDs = array();
$relatedStoryIds = array();
foreach($stories as $story)
{
$relatedProductIdList[$story->product] = $story->product;
$relatedPlanIdList[$story->plan] = $story->plan;
$relatedBranchIdList[$story->branch] = $story->branch;
$relatedStoryIDs[$story->id] = $story->id;
$relatedStoryIds[$story->id] = $story->id;
if(isset($relations[$story->id])) $story->linkStories = $story->linkStories . ',' . $relations[$story->id];
@@ -2359,9 +2359,9 @@ class story extends control
}
}
$storyTasks = $this->loadModel('task')->getStoryTaskCounts($relatedStoryIDs);
$storyBugs = $this->loadModel('bug')->getStoryBugCounts($relatedStoryIDs);
$storyCases = $this->loadModel('testcase')->getStoryCaseCounts($relatedStoryIDs);
$storyTasks = $this->loadModel('task')->getStoryTaskCounts($relatedStoryIds);
$storyBugs = $this->loadModel('bug')->getStoryBugCounts($relatedStoryIds);
$storyCases = $this->loadModel('testcase')->getStoryCaseCounts($relatedStoryIds);
/* Get related objects title or names. */
$productsType = $this->dao->select('id, type')->from(TABLE_PRODUCT)->where('id')->in($relatedProductIdList)->fetchPairs();
module/story/model.php
+2 -2
View File
@@ -4389,14 +4389,14 @@ class storyModel extends model
}
/**
* Get story relation by IDs.
* Get story relation by Ids.
*
* @param array $storyIdList
* @param string $storyType
* @access public
* @return array
*/
public function getStoryRelationByIDs($storyIdList, $storyType)
public function getStoryRelationByIds($storyIdList, $storyType)
{
$conditionField = $storyType == 'story' ? 'BID' : 'AID';
$storyType = $storyType == 'story' ? 'BID, GROUP_CONCAT(`AID` SEPARATOR ",")' : 'AID, GROUP_CONCAT(`BID` SEPARATOR ",")';