From 97afbbcef4ece8e5f190948f7a45755f2e1f1c8c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 10 Apr 2023 16:44:01 +0800 Subject: [PATCH] * fix bug #33950. --- module/doc/model.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index 89846b99bf..dee4925c2e 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -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');