Merge branch 'sprint/231_dongli_64973' into 'master'

* Finish task #64972,64973,64969. See merge request easycorp/zentaopms!5076
2022-08-24 01:14:44 +00:00
parent 5bbf28e974 0e393e120b
commit 03ea51fe76
9 changed files with 84 additions and 12 deletions
@@ -1315,12 +1315,16 @@ class executionModel extends model
     * Get execution by idList.
     *
     * @param  array  $executionIdList
+     * @param  string $mode all
     * @access public
     * @return array
     */
-    public function getByIdList($executionIdList = array())
+    public function getByIdList($executionIdList = array(), $mode = '')
    {
-        return $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->andWhere('deleted')->eq(0)->fetchAll('id');
+        return $this->dao->select('*')->from(TABLE_EXECUTION)
+            ->where('id')->in($executionIdList)
+            ->beginIF($mode != 'all')->andWhere('deleted')->eq(0)->fi()
+            ->fetchAll('id');
    }

    /**