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

* Adjust code for feedback #2191

Browse Source
This commit is contained in:
liuhong
2023-02-14 01:43:35 +00:00
parent f86fe5a65d
commit e9d2d7362a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+5 -1
View File
@@ -2658,7 +2658,11 @@ EOD;
if($this->app->user->account == $program->openedBy or $this->app->user->account == $program->PM) $program->auth = 'extend';
if($program->auth == 'extend') $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights);
if($program->auth == 'extend')
{
$this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights);
$this->session->set('user', $this->app->user);
}
if($program->auth == 'reset')
{
/* If priv way is reset, unset common program priv, and cover by program priv. */
module/user/model.php
+1 -1
View File
@@ -1109,7 +1109,7 @@ class userModel extends model
->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id = t2.`group`')
->leftJoin(TABLE_GROUPPRIV)->alias('t3')->on('t2.`group` = t3.`group`')
->where('t2.account')->eq($account)
->beginIF($group->project != 0)->andWhere('t1.project')->eq($group->project)
->andWhere('t1.project')->eq(0)
->andWhere('t1.vision')->eq($this->config->vision);
}