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

* finish task #41529.

Browse Source
This commit is contained in:
王怡栋
2021-08-20 13:58:50 +08:00
parent 7160110264
commit 4c841a2f23
6 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -1044,7 +1044,7 @@ class actionModel extends model
$objectNames['user'][0] = 'guest'; // Add guest account.
/* Get the same dept department. */
$deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
foreach($actions as $i => $action)
{
/* Add name field to the actions. */
module/dept/model.php
+6 -4
View File
@@ -392,15 +392,17 @@ class deptModel extends model
* Get user pairs of a department.
*
* @param int $deptID
* @param string $params userid|outside|all
* @param string $key id|account
* @param string $type inside|outside
* @param string $params all
* @access public
* @return array
*/
public function getDeptUserPairs($deptID = 0, $params = '')
public function getDeptUserPairs($deptID = 0, $key = 'account', $type = 'inside', $params = '')
{
$childDepts = $this->getAllChildID($deptID);
$keyField = strpos($params, 'useid') !== false ? 'id' : 'account';
$type = (strpos($params, 'outside') !== false) ? 'outside' : 'inside';
$keyField = $key == 'id' ? 'id' : 'account';
$type = $type == 'outside' ? 'outside' : 'inside';
return $this->dao->select("$keyField, realname")->from(TABLE_USER)
->where('deleted')->eq(0)
module/execution/control.php
+1 -1
View File
@@ -1186,7 +1186,7 @@ class execution extends control
$this->view->title = $title;
$this->view->position = $position;
$this->view->deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$this->view->deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->display();
module/project/control.php
+1 -1
View File
@@ -1168,7 +1168,7 @@ class project extends control
$this->view->title = $project->name . $this->lang->colon . $this->lang->project->team;
$this->view->projectID = $projectID;
$this->view->teamMembers = $this->project->getTeamMembers($projectID);
$this->view->deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$this->view->deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
$this->view->canBeChanged = common::canModify('project', $project);
$this->display();
module/report/control.php
+1 -1
View File
@@ -324,7 +324,7 @@ class report extends control
if($dept)
{
$users = $this->loadModel('dept')->getDeptUserPairs($dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($dept, 'id');
$users = array('' => $this->lang->report->annualData->allUser) + $users;
}
module/user/control.php
+11 -11
View File
@@ -80,7 +80,7 @@ class user extends control
$account = $user->account;
$todos = $this->todo->getList($type, $account, $status, 0, $pager, $sort);
$date = (int)$type == 0 ? helper::today() : $type;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
if(!isset($users[$userID])) die(js::error($this->lang->user->error->noAccess) . js::locate('back'));
/* set menus. */
@@ -123,7 +123,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Modify story title. */
$this->loadModel('story');
@@ -166,7 +166,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Set the menu. */
$this->view->userList = $this->user->setUserList($users, $userID);
@@ -207,7 +207,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Set menu. */
$this->view->userList = $this->user->setUserList($users, $userID);
@@ -247,7 +247,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Set menu. */
$this->view->userList = $this->user->setUserList($users, $userID);
@@ -298,7 +298,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Append id for secend sort. */
$sort = $this->loadModel('common')->appendOrder($orderBy);
@@ -349,7 +349,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -389,7 +389,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -429,7 +429,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -462,7 +462,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
$this->view->title = "USER #$user->id $user->account/" . $this->lang->user->profile;
$this->view->position[] = $this->lang->user->common;
@@ -1080,7 +1080,7 @@ class user extends control
{
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
/* set menus. */
$this->view->userList = $this->user->setUserList($users, $userID);