From 21fe8daa0da7b7d31a169ec9aa7408ce3830b672 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 10 Aug 2020 16:22:10 +0800
Subject: [PATCH] Fix bug #3338 #3342

---
 module/doc/model.php       | 8 ++++----
 module/project/control.php | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 4e93fc45d4..5c0201d6a1 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -338,7 +338,7 @@ class docModel extends model
                 ->andWhere('addedBy')->eq($this->app->user->account)
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
         }
         elseif($browseType == 'byediteddate')
         {
@@ -365,7 +365,7 @@ class docModel extends model
                 ->andWhere('collector')->like("%,{$this->app->user->account},%")
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
         }
         elseif($browseType == "bymodule")
         {
@@ -422,7 +422,7 @@ class docModel extends model
                 ->andWhere('lib')->in($allLibs)
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
         }
         elseif($browseType == 'fastsearch')
         {
@@ -440,7 +440,7 @@ class docModel extends model
                 ->andWhere('t1.lib')->in($allLibs)
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
             foreach($docs as $doc) $doc->title = str_replace($this->session->searchDoc, "<span style='color:red'>{$this->session->searchDoc}</span>", $doc->title);
         }
 
diff --git a/module/project/control.php b/module/project/control.php
index 7ac0974948..ee09997c0b 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1649,6 +1649,8 @@ class project extends control
         $this->app->session->set('taskList',    $uri);
         $this->app->session->set('storyList',   $uri);
         $this->app->session->set('projectList', $uri);
+        $this->app->session->set('caseList', $uri);
+        $this->app->session->set('bugList', $uri);
 
         if($type === 'json') die(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));