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

* fix bug #33950.

Browse Source
This commit is contained in:
wangyidong
2023-04-10 16:44:17 +08:00
parent a81a24ff6a
commit 97afbbcef4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+3 -3
View File
@@ -614,7 +614,7 @@ class docModel extends model
->andWhere('vision')->eq($this->config->vision)
->andWhere('id')->in($docIdList)
->beginIF($browseType == 'all')->andWhere("(status = 'normal' or (status = 'draft' and addedBy='{$this->app->user->account}'))")->fi()
->beginIF($browseType == 'draft')->andWhere('status')->eq('draft')->fi()
->beginIF($browseType == 'draft')->andWhere('status')->eq('draft')->andWhere('addedBy')->eq($this->app->user->account)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
@@ -644,7 +644,7 @@ class docModel extends model
->andWhere('t2.action')->eq($type)
->andWhere('t2.actor')->eq($this->app->user->account)
->beginIF($browseType == 'all')->andWhere("(t1.status = 'normal' or (t1.status = 'draft' and t1.addedBy='{$this->app->user->account}'))")->fi()
->beginIF($browseType == 'draft')->andWhere('t1.status')->eq('draft')->fi()
->beginIF($browseType == 'draft')->andWhere('t1.status')->eq('draft')->andWhere('t1.addedBy')->eq($this->app->user->account)->fi()
->orderBy($orderBy)
->page($pager, 't1.id')
->fetchAll('id');
@@ -656,7 +656,7 @@ class docModel extends model
->where('t1.deleted')->eq(0)
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.addedBy')->eq($this->app->user->account)
->beginIF($browseType == 'draft')->andWhere('t1.status')->eq('draft')->fi()
->beginIF($browseType == 'draft')->andWhere('t1.status')->eq('draft')->andWhere('t1.addedBy')->eq($this->app->user->account)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');