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

Merge branch 'sprint/203_zg_56558' into 'master'

Browse Source 
* Finish task#56558

See merge request easycorp/zentaopms!3892
This commit is contained in:
孙广明
2022-06-14 06:58:39 +00:00
parent 7d37afcd4f 8bfc6dec02
commit dbb1ccc413
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -3
View File
@@ -2737,8 +2737,8 @@ class execution extends control
$this->loadModel('user');
$this->loadModel('dept');
$execution = $this->execution->getById($executionID);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst', '', $this->config->maxCount);
$execution = $this->execution->getById($executionID);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst');
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = empty($dept) ? array() : $this->dept->getDeptUserPairs($dept);
@@ -2753,7 +2753,7 @@ class execution extends control
foreach($members2Import as $member) $appendUsers[$member->account] = $member->account;
foreach($deptUsers as $deptAccount => $userName) $appendUsers[$deptAccount] = $deptAccount;
$users = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendUsers, $this->config->maxCount);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendUsers);
$roles = $this->user->getUserRoles(array_keys($users));
/* Set menu. */