From d86cd9420c5a8bfa221fe2e1a04faeeb48d916fc Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 17 Nov 2020 09:43:41 +0800
Subject: [PATCH] * Modify document query error data.

---
 module/doc/control.php   | 4 ++--
 module/doc/model.php     | 4 ++--
 module/product/model.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index e4295de115..445772be6b 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -56,8 +56,8 @@ class doc extends control
         $this->view->title      = $this->lang->doc->common . $this->lang->colon . $this->lang->doc->index;
         $this->view->position[] = $this->lang->doc->index;
 
-        $this->view->latestEditedDocs = $this->loadModel('doc')->getDocsByBrowseType(0, 'byediteddate', 0, 0, 'editedDate_desc, id_desc', $pager);
-        $this->view->myDocs           = $this->loadModel('doc')->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager);
+        $this->view->latestEditedDocs = $this->doc->getDocsByBrowseType(0, 'byediteddate', 0, 0, 'editedDate_desc, id_desc', $pager);
+        $this->view->myDocs           = $this->doc->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager);
         $this->view->statisticInfo    = $this->doc->getStatisticInfo();
         $this->view->users            = $this->loadModel('user')->getPairs('noletter');
         $this->view->doingProjects    = $this->loadModel('project')->getProjectsByProgram($this->session->PRJ, 'undone', 5);
diff --git a/module/doc/model.php b/module/doc/model.php
index 8fa41ff68f..73a17985db 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -149,7 +149,7 @@ class docModel extends model
             $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
             $stmt  = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1')
                 ->leftJoin($table)->alias('t2')->on("t1.$type=t2.id")
-                ->beginIF(!empty($idList))->andWhere('t2.id')->in($idList)->fi()
+                ->andWhere('t2.id')->in($idList)
                 ->beginIF($type == 'project' and strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
                 ->andWhere('t1.deleted')->eq(0)
                 ->orderBy("t2.order desc, t1.order, t1.id")
@@ -1114,7 +1114,7 @@ class docModel extends model
             $stmt  = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1')
                 ->leftJoin($table)->alias('t2')->on("t1.$type=t2.id")
                 ->where('t1.deleted')->eq(0)->andWhere("t1.$type")->ne(0)
-                ->beginIF(!empty($idList))->andWhere('t2.id')->in($idList)->fi()
+                ->andWhere('t2.id')->in($idList)
                 ->beginIF($type == 'project' and strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
                 ->beginIF(strpos($this->config->doc->custom->showLibs, 'zero') === false)->andWhere('t1.id')->in($nonzeroLibs)->fi()
                 ->orderBy("t2.`order` desc, t1.`order` asc, id desc")
diff --git a/module/product/model.php b/module/product/model.php
index a2a7e2589f..a8ed8f6ea5 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -331,14 +331,14 @@ class productModel extends model
      * Get product id by project.
      *
      * @param  int    $projectID
-     * @param  int    $backFirst
+     * @param  int    $isFirst
      * @access public
      * @return array
      */
-    public function getProductIDByProject($projectID, $backFirst = true)
+    public function getProductIDByProject($projectID, $isFirst = true)
     {
         $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs();
-        if($backFirst === false) return $products;
+        if($isFirst === false) return $products;
         return empty($products) ? 0 : current($products);
     }