From e551fa25e8121da29470f70c19df5ec75ecee3ed Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 6 Sep 2022 17:06:26 +0800
Subject: [PATCH 1/2] * Fix bug #26648.

---
 module/release/model.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/release/model.php b/module/release/model.php
index 1911a6a79f..eb45eb8b68 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -335,10 +335,13 @@ class releaseModel extends model
             }
             elseif(($notify == 'ET' or $notify == 'PT') and !empty($release->build))
             {
-                $type    = $notify == 'ET' ? 'execution' : 'project';
-                $members = $this->dao->select('t2.account')->from(TABLE_BUILD)->alias('t1')
-                    ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.' . $type . '=t2.root')
-                    ->where('t2.type')->eq($type)
+                $type     = $notify == 'ET' ? 'execution' : 'project';
+                $table    = $notify == 'ET' ? TABLE_BUILD : TABLE_RELEASE;
+                $objectID = $notify == 'ET' ? $release->build : $release->id;
+                $members  = $this->dao->select('t2.account')->from($table)->alias('t1')
+                    ->leftJoin(TABLE_TEAM)->alias('t2')->on("t1.$type=t2.root and t2.type='$type'")
+                    ->where('t1.id')->eq($objectID)
+                    ->andWhere('t2.type')->eq($type)
                     ->fetchPairs();
 
                 if(empty($members)) continue;

From 66f95f43ab1d51a517126362f233c21f749295e3 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 6 Sep 2022 17:11:24 +0800
Subject: [PATCH 2/2] * Optimize code for bug #26648.

---
 module/release/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/release/model.php b/module/release/model.php
index eb45eb8b68..1215b765bd 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -339,7 +339,7 @@ class releaseModel extends model
                 $table    = $notify == 'ET' ? TABLE_BUILD : TABLE_RELEASE;
                 $objectID = $notify == 'ET' ? $release->build : $release->id;
                 $members  = $this->dao->select('t2.account')->from($table)->alias('t1')
-                    ->leftJoin(TABLE_TEAM)->alias('t2')->on("t1.$type=t2.root and t2.type='$type'")
+                    ->leftJoin(TABLE_TEAM)->alias('t2')->on("t1.$type=t2.root")
                     ->where('t1.id')->eq($objectID)
                     ->andWhere('t2.type')->eq($type)
                     ->fetchPairs();