From f451f2865bc0aa9b9ed6c30ce279a8ef1198415e Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Thu, 20 Jan 2022 14:22:51 +0800 Subject: [PATCH] * filter doclib by vision. --- module/doc/model.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module/doc/model.php b/module/doc/model.php index 2f9349ae0b..cd564b84f7 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -69,6 +69,7 @@ class docModel extends model $stmt = $this->dao->select('*')->from(TABLE_DOCLIB) ->where('type')->ne('api') ->beginIF($type == 'all')->andWhere('deleted')->eq(0)->fi() + ->andWhere('vision')->eq($this->config->vision) ->orderBy('id_desc') ->query(); } @@ -76,6 +77,7 @@ class docModel extends model { $stmt = $this->dao->select('*')->from(TABLE_DOCLIB) ->where('deleted')->eq(0) + ->andWhere('vision')->eq($this->config->vision) ->beginIF($type)->andWhere('type')->eq($type)->fi() ->beginIF(!$type)->andWhere('type')->ne('api')->fi() ->beginIF($objectID and strpos(',product,project,execution,', ",$type,") !== false)->andWhere($type)->eq($objectID)->fi() @@ -453,6 +455,7 @@ class docModel extends model $docIdList = $this->getPrivDocs($libID, $module); return $this->dao->select('*')->from(TABLE_DOC) ->where('deleted')->eq(0) + ->andWhere('vision')->eq($this->config->vision) ->andWhere('id')->in($docIdList) ->orderBy($orderBy) ->page($pager) @@ -1008,7 +1011,7 @@ class docModel extends model $libs = $this->getLibs($type == 'collector' ? 'all' : $type); $key = ($type == 'product' or $type == 'execution') ? $type : 'id'; - $stmt = $this->dao->select("DISTINCT $key")->from(TABLE_DOCLIB)->where('deleted')->eq(0); + $stmt = $this->dao->select("DISTINCT $key")->from(TABLE_DOCLIB)->where('deleted')->eq(0)->andWhere('vision')->eq($this->config->vision); if($type == 'product' or $type == 'execution') { $stmt = $stmt->andWhere($type)->ne(0); @@ -1063,6 +1066,7 @@ class docModel extends model $libs = $this->getLibs('all', '', $appendLibs); $stmt = $this->dao->select("id,type,product,execution,name")->from(TABLE_DOCLIB) ->where('deleted')->eq(0) + ->andWhere('vision')->eq($this->config->vision) ->andWhere("id")->in(array_keys($libs)) ->orderBy("product desc,execution desc, `order` asc, id asc") ->query(); @@ -1251,6 +1255,7 @@ class docModel extends model { $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB) ->where('deleted')->eq(0) + ->andWhere('vision')->eq($this->config->vision) ->andWhere('type')->eq($type) ->beginIF(!empty($appendLib))->orWhere('id')->eq($appendLib)->fi() ->beginIF($type == 'custom')->orderBy('`order`, id')->fi() @@ -1265,6 +1270,7 @@ class docModel extends model { $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB) ->where('deleted')->eq(0) + ->andWhere('vision')->eq($this->config->vision) ->andWhere($type)->eq($objectID) ->beginIF(!empty($appendLib))->orWhere('id')->eq($appendLib)->fi() ->beginIF($type == 'project')->andWhere('execution')->eq(0)->fi()