diff --git a/module/doc/model.php b/module/doc/model.php
index 1a1999f9bc..9bd29b9b56 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -437,7 +437,7 @@ class docModel extends model
             $docs = $this->dao->select('t1.*, t2.name as libName, t2.type as objectType')->from(TABLE_DOC)->alias('t1')
                 ->leftJoin(TABLE_DOCLIB)->alias('t2')->on("t1.lib=t2.id")
                 ->where('t1.deleted')->eq(0)
-                ->andWhere('t1.lib')->in($allLibIDList)
+                ->andWhere('t1.lib')->ne('')
                 ->andWhere('t1.id')->in($hasPrivDocIdList)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('t1.addedBy')->eq($this->app->user->account)
@@ -448,18 +448,18 @@ class docModel extends model
         }
         elseif($browseType == 'editedbyme')
         {
-            $docIDList = $this->dao->select('objectID')->from(TABLE_ACTION)
+            $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')
+                ->andWhere('vision')->eq($this->config->vision)
                 ->fetchAll('objectID');
 
             $docs = $this->dao->select('t1.*, t2.name as libName, t2.type as objectType')->from(TABLE_DOC)->alias('t1')
                 ->leftJoin(TABLE_DOCLIB)->alias('t2')->on("t1.lib=t2.id")
                 ->where('t1.deleted')->eq(0)
-                ->andWhere('t1.id')->in(array_keys($docIDList))
-                ->andWhere('t1.lib')->in($allLibIDList)
+                ->andWhere('t1.id')->in(array_keys($docIdList))
+                ->andWhere('t1.lib')->ne('')
                 ->andWhere('t1.vision')->in($this->config->vision)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
                 ->orderBy($sort)
@@ -483,7 +483,7 @@ class docModel extends model
             $docs = $this->dao->select('t1.*')->from(TABLE_DOC)->alias('t1')
                 ->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.lib')->ne('')
                 ->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)
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 323b3429b9..d2b37e253f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -9039,7 +9039,7 @@ class upgradeModel extends model
                     $filter->name       = $vars->showName[$index];
                     $filter->type       = $vars->requestType[$index];
                     $filter->typeOption = $filter->type == 'select' ? $vars->selectList[$index] : '';
-                    $filter->default    = $vars->default[$index];
+                    $filter->default    = isset($vars->default) ? zget($vars->default, $index, '') : '';
 
                     $filters[] = $filter;
                 }