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

Merge branch 'feature/doctemplate' into release/21.7.2

Browse Source
This commit is contained in:
xieqiyu
2025-06-18 02:18:57 +00:00
parent c9c2fb2e63 1cd90a2cd0
commit 2155a40448
174 changed files with 7507 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+10 -11
View File
@@ -1945,18 +1945,18 @@ class executionModel extends model
* 根据产品/执行等信息获取任务列表
* Get tasks by product/execution etc.
*
* @param int $productID
* @param int $executionID
* @param array $executions
* @param string $browseType
* @param int $queryID
* @param int $moduleID
* @param string $sort
* @param object $pager
* @param int $productID
* @param int|array $executionID
* @param array $executions
* @param string $browseType
* @param int $queryID
* @param int $moduleID
* @param string $sort
* @param object $pager
* @access public
* @return array
*/
public function getTasks(int $productID, int $executionID, array $executions, string $browseType, int $queryID, int $moduleID, string $sort, object $pager = null): array
public function getTasks(int $productID, int|array $executionID, array $executions, string $browseType, int $queryID, int $moduleID, string $sort, object $pager = null): array
{
if(common::isTutorialMode()) return $this->loadModel('tutorial')->getTasks();
@@ -5349,9 +5349,8 @@ class executionModel extends model
$toList = $ccList = '';
$toList = array_merge(array_keys($teamMembers), $whitelist);
$toList = implode(',', array_keys($teamMembers));
return array($toList, $ccList);
return array(implode(',', $toList), $ccList);
}
/**