Merge branch 'fixbugs_zhouxin_17322' into 'master'

Fixbugs zhouxin 17322 See merge request easycorp/zentaopms!2631
2022-03-30 05:12:36 +00:00
parent 60b5461414 a8d3ff2801
commit 3a808fc514
2 changed files with 4 additions and 2 deletions
@@ -1262,7 +1262,7 @@ class executionModel extends model
     * @access public
     * @return array
     */
-    public function getByProject($projectID, $status = 'all', $limit = 0, $pairs = false)
+    public function getByProject($projectID, $status = 'all', $limit = 0, $pairs = false, $devel = false)
    {
        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getExecutionPairs();

@@ -1276,6 +1276,7 @@ class executionModel extends model
            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
            ->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi()
            ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
+            ->beginIF($devel === true)->andWhere('attribute')->in('dev,qa,release')->fi()
            ->orderBy($orderBy)
            ->beginIF($limit)->limit($limit)->fi()
            ->fetchAll('id');