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

* Adjust code.

Browse Source
This commit is contained in:
tianshujie98
2021-04-29 08:26:38 +08:00
parent 6530f01c2f
commit b0ee3e7ada
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/control.php
+6 -2
View File
@@ -256,7 +256,12 @@ class group extends control
$groupUsers = $this->group->getUserPairs($groupID);
$allUsers = $this->loadModel('dept')->getDeptUserPairs($deptID);
$otherUsers = array_diff_assoc($allUsers, $groupUsers);
$outsideUsers = $this->user->getPairs('outside|noclosed|noletter|noempty');
if($this->config->systemMode == 'new')
{
$outsideUsers = $this->user->getPairs('outside|noclosed|noletter|noempty');
$this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers);
}
$title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember;
$position[] = $group->name;
@@ -268,7 +273,6 @@ class group extends control
$this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createGroupManageMemberLink'), $groupID);
$this->view->groupUsers = $groupUsers;
$this->view->otherUsers = $otherUsers;
$this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers);
$this->display();
}