* change moduleIds into moduleIdList.

This commit is contained in:
chenfeiCF
2016-04-29 15:45:01 +08:00
parent fa2cadf195
commit cc2a7e60c0
5 changed files with 21 additions and 21 deletions
+3 -3
View File
@@ -819,21 +819,21 @@ class taskModel extends model
* Get tasks list of a project.
*
* @param int $projectID
* @param array|string $moduleIds
* @param array|string $moduleIdList
* @param string $status
* @param string $orderBy
* @param object $pager
* @access public
* @return array
*/
public function getTasksByModule($projectID = 0, $moduleIds = 0, $orderBy = 'id_desc', $pager = null)
public function getTasksByModule($projectID = 0, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null)
{
$tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.product, t2.branch, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')
->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
->where('t1.project')->eq((int)$projectID)
->beginIF($moduleIds)->andWhere('t1.module')->in($moduleIds)->fi()
->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi()
->andWhere('t1.deleted')->eq(0)
->orderBy($orderBy)
->page($pager)