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

* Fix bug #20432.

Browse Source
This commit is contained in:
tanghucheng
2022-03-09 10:55:55 +08:00
parent 2d3c8464d3
commit 07f2f81d43
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dept/model.php
+1 -2
View File
@@ -409,8 +409,7 @@ class deptModel extends model
->where('deleted')->eq(0)
->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi()
->beginIF($childDepts)->andWhere('dept')->in($childDepts)->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('account')
->fetchPairs();
}
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();