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

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

Browse Source
This commit is contained in:
王怡栋
2022-03-10 10:36:40 +08:00
parent 53c2dd44fb 9fb53de457
commit 01f6eb4cc3
78 changed files with 1231 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/control.php
-2
View File
@@ -526,7 +526,6 @@ class user extends control
$groups = $this->dao->select('id, name, role')
->from(TABLE_GROUP)
->where('vision')->eq($this->config->vision)
->fetchAll();
$groupList = array('' => '');
$roleGroup = array();
@@ -561,7 +560,6 @@ class user extends control
{
$groups = $this->dao->select('id, name, role')
->from(TABLE_GROUP)
->where('vision')->eq($this->config->vision)
->fetchAll();
$groupList = array('' => '');
$roleGroup = array();
module/user/model.php
+1 -2
View File
@@ -282,8 +282,7 @@ class userModel extends model
->beginIF($query)->andWhere($query)->fi()
->beginIF($browseType == 'inside')->andWhere('type')->eq('inside')->fi()
->beginIF($browseType == 'outside')->andWhere('type')->eq('outside')->fi()
->beginIF($this->config->vision == 'lite')->andWhere('visions')->eq('lite')->fi()
->beginIF($this->config->vision != 'lite')->andWhere('visions')->ne('lite')->fi()
->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll();