From 5444be867774490849c1c3d69e2abe4dad48ef84 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 12 Apr 2023 15:08:32 +0800
Subject: [PATCH] * Code for task #90782.

---
 module/block/control.php                        |  2 --
 module/block/view/docmycollectionblock.html.php |  2 +-
 module/block/view/docrecentupdateblock.html.php |  2 +-
 module/doc/model.php                            | 14 +++++++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 14b86d1614..b3763f754e 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -2083,7 +2083,6 @@ class block extends control
             $libList[] = $doc->lib;
         }
 
-        $this->view->pricDocs = $this->doc->getPrivDocs($libList);
         $this->view->docList  = $docList;
     }
 
@@ -2109,7 +2108,6 @@ class block extends control
             $libList[] = $doc->lib;
         }
 
-        $this->view->pricDocs = $this->doc->getPrivDocs($libList);
         $this->view->docList  = $docList;
     }
 
diff --git a/module/block/view/docmycollectionblock.html.php b/module/block/view/docmycollectionblock.html.php
index c065d45e29..7920f4e90d 100644
--- a/module/block/view/docmycollectionblock.html.php
+++ b/module/block/view/docmycollectionblock.html.php
@@ -30,7 +30,7 @@
   <div class="doc-list">
     <?php foreach($docList as $doc):?>
     <div class="doc-box">
-    <button class="btn shadow-primary-hover <?php if(!$canView or !in_array($doc->id, $pricDocs)) echo 'no-priv';?>" data-link='<?php echo $this->createLink("doc", "view", "docID=$doc->id");?>'>
+    <button class="btn shadow-primary-hover <?php if(!$canView) echo 'no-priv';?>" data-link='<?php echo $this->createLink("doc", "view", "docID=$doc->id");?>'>
         <span class='date-interval text-muted'>
           <?php
           $interval = $doc->editInterval;
diff --git a/module/block/view/docrecentupdateblock.html.php b/module/block/view/docrecentupdateblock.html.php
index c75c37e8b1..4296b8e89b 100644
--- a/module/block/view/docrecentupdateblock.html.php
+++ b/module/block/view/docrecentupdateblock.html.php
@@ -30,7 +30,7 @@
   <div class="doc-list">
     <?php foreach($docList as $doc):?>
     <div class="doc-box">
-    <button class="btn shadow-primary-hover <?php if(!$canView or !in_array($doc->id, $pricDocs)) echo 'no-priv';?>" data-link='<?php echo $this->createLink("doc", "view", "docID=$doc->id");?>'>
+    <button class="btn shadow-primary-hover <?php if(!$canView) echo 'no-priv';?>" data-link='<?php echo $this->createLink("doc", "view", "docID=$doc->id");?>'>
         <span class='date-interval text-muted'>
           <?php
           $interval = $doc->editInterval;
diff --git a/module/doc/model.php b/module/doc/model.php
index dcb5c0cd2d..f6e51d007d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -382,13 +382,13 @@ class docModel extends model
      */
     public function getDocsByBrowseType($browseType, $queryID, $moduleID, $sort, $pager)
     {
-        $allLibs      = $this->getLibs('all');
-        $allLibIDList = array_keys($allLibs);
-        $docIdList    = $this->getPrivDocs(0, $moduleID);
+        $allLibs          = $this->getLibs('all');
+        $allLibIDList     = array_keys($allLibs);
+        $hasPrivDocIdList = $this->getPrivDocs(0, $moduleID);
 
         $files = $this->dao->select('*')->from(TABLE_FILE)
             ->where('objectType')->eq('doc')
-            ->andWhere('objectID')->in($docIdList)
+            ->andWhere('objectID')->in($hasPrivDocIdList)
             ->fetchGroup('objectID');
 
         if($browseType == "all")
@@ -418,6 +418,7 @@ class docModel extends model
             $query     = $this->getDocQuery($this->session->contributeDocQuery);
             $docIDList = $this->dao->select('objectID')->from(TABLE_ACTION)
                 ->where('objectType')->eq('doc')
+                ->andWhere('objectID')->in($hasPrivDocIdList)
                 ->andWhere('actor')->eq($this->app->user->account)
                 ->andWhere('action')->eq('edited')
                 ->fetchAll('objectID');
@@ -438,6 +439,7 @@ class docModel extends model
             $docs = $this->dao->select('*')->from(TABLE_DOC)
                 ->where('deleted')->eq(0)
                 ->andWhere('lib')->in($allLibIDList)
+                ->andWhere('id')->in($hasPrivDocIdList)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('addedBy')->eq($this->app->user->account)
                 ->orderBy($sort)
@@ -449,6 +451,7 @@ class docModel extends model
             $docIDList = $this->dao->select('objectID')->from(TABLE_ACTION)
                 ->where('objectType')->eq('doc')
                 ->andWhere('actor')->eq($this->app->user->account)
+                ->andWhere('objectID')->in($hasPrivDocIdList)
                 ->andWhere('action')->eq('edited')
                 ->fetchAll('objectID');
             $docs      = $this->dao->select('*')->from(TABLE_DOC)
@@ -464,7 +467,7 @@ class docModel extends model
         {
             $docs = $this->dao->select('*')->from(TABLE_DOC)
                 ->where('deleted')->eq(0)
-                ->andWhere('id')->in($docIdList)
+                ->andWhere('id')->in($hasPrivDocIdList)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('lib')->in($allLibIDList)
                 ->orderBy('editedDate_desc')
@@ -477,6 +480,7 @@ class docModel extends model
                 ->leftJoin(TABLE_DOCACTION)->alias('t2')->on("t1.id=t2.doc && t2.action='collect'")
                 ->where('t1.deleted')->eq(0)
                 ->andWhere('t1.lib')->in($allLibIDList)
+                ->andWhere('t1.id')->in($hasPrivDocIdList)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('t2.actor')->eq($this->app->user->account)
                 ->orderBy($sort)