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

Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite

Browse Source
This commit is contained in:
王怡栋
2022-01-21 10:40:23 +08:00
parent 6fb0596226 fe7fa92b9c
commit 2631dd6743
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/model.php
+3 -1
View File
@@ -931,6 +931,7 @@ class userModel extends model
$groups = $this->dao->select('t1.acl, t1.project')->from(TABLE_GROUP)->alias('t1')
->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id=t2.`group`')
->where('t2.account')->eq($account)
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.role')->ne('projectAdmin')
->andWhere('t1.role')->ne('limited')
->fetchAll();
@@ -991,7 +992,8 @@ 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)
->andWhere('t1.project')->eq(0);
->andWhere('t1.project')->eq(0)
->andWhere('t1.vision')->eq($this->config->vision);
}
$stmt = $sql->query();