diff --git a/module/group/control.php b/module/group/control.php index 588e4ea9b2..1705d62172 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -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(); } diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index 5a1cc302e0..723cf84131 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -58,6 +58,7 @@ + systemMode == 'new'):?>
@@ -71,6 +72,7 @@ +