From 3c3ce6735408cea370e293ec64c70f0fb1b7d2ac Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Thu, 1 Dec 2022 13:35:05 +0800
Subject: [PATCH] * Refactor code.

---
 module/message/model.php |  4 ++--
 module/task/model.php    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/message/model.php b/module/message/model.php
index 9312d318a5..f0191d4173 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -202,8 +202,8 @@ class messageModel extends model
         }
         if(empty($toList) and $objectType == 'task' and $object->mode == 'multi')
         {
-            $assignedTo = $this->loadModel('task')->getTeamTaskAssignedTo($object->id);
-            $toList     = array_filter($assignedTo, function($account){
+            $teamMembers = $this->loadModel('task')->getTeamMembers($object->id);
+            $toList      = array_filter($teamMembers, function($account){
                 return $account != $this->app->user->account;
             });
             $toList     = implode(',', $toList);
diff --git a/module/task/model.php b/module/task/model.php
index 9bf08e1551..a4f91f91b2 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3926,7 +3926,7 @@ class taskModel extends model
         $toTeamTaskList = '';
         if($task->mode == 'multi')
         {
-            $toTeamTaskList = $this->getTeamTaskAssignedTo($task->id);
+            $toTeamTaskList = $this->getTeamMembers($task->id);
             $toTeamTaskList = implode(',', $toTeamTaskList);
             $toList         = $toTeamTaskList;
         }
@@ -4348,17 +4348,17 @@ class taskModel extends model
     }
 
     /**
-     * Get teamTask assignedTo.
+     * Get teamTask members.
      *
      * @param  int    $taskID
      * @access public
      * @return array
      */
-    public function getTeamTaskAssignedTo($taskID)
+    public function getTeamMembers($taskID)
     {
         $taskType = $this->dao->select('mode')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('mode');
         if($taskType != 'multi') return array();
-        $assignedToList = $this->dao->select('account')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->fetchPairs();
-        return empty($assignedToList) ? array() : array_keys($assignedToList);
+        $teamMembers = $this->dao->select('account')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->fetchPairs();
+        return empty($teamMembers) ? $teamMembers : array_keys($teamMembers);
     }
 }