From b9d031bda1bae5d9d20c111e3f47e084755de205 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 23 Aug 2022 09:27:56 +0800
Subject: [PATCH] * Fix bug #65908.

---
 module/port/config.php |  2 +-
 module/port/model.php  | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/module/port/config.php b/module/port/config.php
index 2b6ead6da0..98b61d8877 100644
--- a/module/port/config.php
+++ b/module/port/config.php
@@ -17,7 +17,7 @@ $config->port->datetimeFeilds = '';
 $config->port->listFields     = '';
 $config->port->sysLangFields  = ',pri,status,type,mode,severity,os,browser,resolution,confirmed,source,reviewResult,stage,change,category';
 $config->port->sysDataFields  = 'execution,product,user';
-$config->port->userFields     = 'assignedTo,openedBy,finishedBy,canceledBy,closedBy,lastEditedBy,lastRunner,resolvedBy,reviewedBy';
+$config->port->userFields     = 'assignedTo,openedBy,finishedBy,canceledBy,closedBy,lastEditedBy,lastRunner,resolvedBy,reviewedBy,mailto';
 
 $config->port->defaultZeroField  = 'severity,pri';
 $config->port->defaultEmptyField = '';
diff --git a/module/port/model.php b/module/port/model.php
index 1112e36cba..c791d2ff07 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -269,6 +269,12 @@ class portModel extends model
             $modelFieldList['values'] = $this->initValues($model, $field, $modelFieldList, $withKey);
             $fieldList[$field] = $modelFieldList;
         }
+
+        if(!empty($fieldList['mailto']))
+        {
+            $fieldList['mailto']['control'] = 'multiple';
+            $fieldList['mailto']['values']  = $this->portConfig->sysDataList['user'];
+        }
         return $fieldList;
     }
 
@@ -403,7 +409,11 @@ class portModel extends model
 
         $sysDataFields = explode(',', $this->portConfig->sysDataFields);
 
-        foreach($sysDataFields as $field) $dataList[$field] = $this->loadModel($field)->getPairs();
+        foreach($sysDataFields as $field)
+        {
+            $dataList[$field] = $this->loadModel($field)->getPairs();
+            if($field == 'user') $dataList[$field] = $this->loadModel($field)->getPairs('noclosed|nodeleted|noletter');
+        }
 
         return $dataList;
     }
@@ -560,9 +570,12 @@ class portModel extends model
                 {
                     if($fieldList[$field]['control'] == 'multiple')
                     {
-                        $multiple = '';
+                        $multiple     = '';
+                        $separator    = $field == 'mailto' ? ',' : "\n";
                         $multipleLsit = explode(',', $value);
-                        foreach($multipleLsit as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
+
+                        foreach($multipleLsit as $key => $tmpValue) $multipleLsit[$key] = zget($exportDatas[$field], $tmpValue);
+                        $multiple = join($separator, $multipleLsit);
                         $rows[$id]->$field = $multiple;
                     }
                     else