From c6c79f47f601b0431fd5667df2e26538138044d3 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Sun, 8 Oct 2023 22:48:06 -0400
Subject: [PATCH] * Finish task #103985.

---
 module/message/model.php  | 9 +++++++++
 module/testtask/model.php | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/module/message/model.php b/module/message/model.php
index fd52490779..c620f18ed1 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -219,6 +219,15 @@ class messageModel extends model
             $toList = $toList . $ccList;
         }
 
+        if($objectType == 'testtask')
+        {
+            $members = explode(',', $object->members);
+            $toList  = explode(',', $toList);
+            $toList  = array_merge($toList, $members);
+            $toList  = array_filter(array_unique($toList));
+            $toList  = implode(',', $toList);
+        }
+
         return $toList;
     }
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 77c691bc7c..addfcf406d 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -33,6 +33,7 @@ class testtaskModel extends model
             ->setDefault('project', $projectID)
             ->setDefault('createdBy', $this->app->user->account)
             ->setDefault('createdDate', helper::now())
+            ->setDefault('members', '')
             ->stripTags($this->config->testtask->editor->create['id'], $this->config->allowedTags)
             ->join('mailto', ',')
             ->join('type', ',')
@@ -777,6 +778,7 @@ class testtaskModel extends model
             ->setDefault('type', '')
             ->setDefault('mailto', '')
             ->setDefault('deleteFiles', array())
+            ->setDefault('members', '')
             ->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)
             ->join('mailto', ',')
             ->join('type', ',')
@@ -1783,7 +1785,7 @@ class testtaskModel extends model
     public function getToAndCcList($testtask)
     {
         /* Set toList and ccList. */
-        $toList   = $testtask->owner;
+        $toList   = $testtask->owner . ',' . $testtask->members . ',';
         $ccList   = str_replace(' ', '', trim($testtask->mailto, ','));
 
         if(empty($toList))
@@ -1801,6 +1803,7 @@ class testtaskModel extends model
                 $ccList   = substr($ccList, $commaPos + 1);
             }
         }
+
         return array($toList, $ccList);
     }