Merge branch 'master_liuhong_26725' into 'master'

*Fix bug #26725. See merge request easycorp/zentaopms!5049
2022-08-25 01:05:32 +00:00
parent cbe4562f1d 11c2730361
commit 1092812a40
2 changed files with 4 additions and 2 deletions
@@ -1577,10 +1577,11 @@ class executionModel extends model
     * @param  string  $status
     * @param  int     $limit
     * @param  string  $pairs
+     * @param  int     $appenedID
     * @access public
     * @return array
     */
-    public function getByProject($projectID, $status = 'all', $limit = 0, $pairs = false, $devel = false)
+    public function getByProject($projectID, $status = 'all', $limit = 0, $pairs = false, $devel = false, $appendedID = 0)
    {
        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getExecutionPairs();

@@ -1597,6 +1598,7 @@ class executionModel extends model
            ->beginIF($status != 'all' and $status != 'undone' and $status != 'noclosed')->andWhere('status')->in($status)->fi()
            ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
            ->beginIF($devel === true)->andWhere('attribute')->in('dev,qa,release')->fi()
+            ->beginIF($appendedID)->orWhere('id')->eq($appendedID)->fi()
            ->orderBy($orderBy)
            ->beginIF($limit)->limit($limit)->fi()
            ->fetchAll('id');