From 7aca388cd8838e05d1cd0cd8f3967383439fe5f1 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Fri, 27 Nov 2020 16:29:43 +0800
Subject: [PATCH] * Finish task #8497.

---
 module/projectrelease/control.php | 2 +-
 module/projectrelease/model.php   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 4d6febe71d..839a1870e3 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -71,7 +71,7 @@ class projectrelease extends control
 
         $this->view->title      = $this->view->project->name . $this->lang->colon . $this->lang->release->browse;
         $this->view->position[] = $this->lang->release->browse;
-        $this->view->releases   = $this->projectrelease->getList($productID, $branch, $type);
+        $this->view->releases   = $this->projectrelease->getList($this->session->PRJ, $productID, $branch, $type);
         $this->view->type       = $type;
         $this->display();
     }
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index 5a1577e4a1..c4d347303e 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -43,19 +43,21 @@ class projectreleaseModel extends model
     /**
      * Get list of releases.
      *
+     * @param  int    $projectID
      * @param  int    $productID
      * @param  int    $branch
      * @param  string $type
      * @access public
      * @return array
      */
-    public function getList($productID, $branch = 0, $type = 'all')
+    public function getList($projectID, $productID, $branch = 0, $type = 'all')
     {
         return $this->dao->select('t1.*, t2.name as productName, t3.id as buildID, t3.name as buildName, t3.project')
             ->from(TABLE_RELEASE)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id')
-            ->where('t1.product')->eq((int)$productID)
+            ->where('t1.PRJ')->eq((int)$projectID)
+            ->andWhere('t1.product')->eq((int)$productID)
             ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
             ->beginIF($type != 'all')->andWhere('t1.status')->eq($type)->fi()
             ->andWhere('t1.deleted')->eq(0)