xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/user' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-08-21 10:15:40 +08:00
parent b75fa2512c bf0e385a59
commit fb2e15c4de
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ticket/service/ConversationService.php
+7 -3
View File
@@ -62,7 +62,8 @@ class ConversationService
'reply' => '', 'reply' => '',
]; ];
//$emailDefault = 'app@hnxinyouhe.com'; //公共邮箱 //$emailDefault = 'app@hnxinyouhe.com'; //公共邮箱
$emailDefault = 'support@hnxinyouhe.com'; //范彩凤 //$emailDefault = 'support@hnxinyouhe.com'; //公共邮箱
$emailDefault = env('TICKET_EMAIL_DEFAULT');
if (empty($conversation)) { if (empty($conversation)) {
$email = $emailDefault; $email = $emailDefault;
}else{ }else{
@@ -86,7 +87,9 @@ class ConversationService
$notice['reply'] = '<li>最新回复：' . $content . '</li>'; $notice['reply'] = '<li>最新回复：' . $content . '</li>';
} }
\app\common\utils\email\MailSend::send($email, '【XYH】新的工单提醒', replaceTpl($notice, 'work_order')); if(!empty($emailDefault)){
\app\common\utils\email\MailSend::send($email, '【XYH】新的工单提醒', replaceTpl($notice, 'work_order'));
}
unset($data['categorie_id']); unset($data['categorie_id']);
unset($data['code']); unset($data['code']);
@@ -110,7 +113,8 @@ class ConversationService
'reply' => '', 'reply' => '',
]; ];
//$emailDefault = 'app@hnxinyouhe.com'; //公共邮箱 //$emailDefault = 'app@hnxinyouhe.com'; //公共邮箱
$emailDefault = 'support@hnxinyouhe.com'; //范彩凤 //$emailDefault = 'support@hnxinyouhe.com'; //公共邮箱
$emailDefault = env('ticket_email_default');
if (empty($conversation)) { if (empty($conversation)) {
$email = $emailDefault; $email = $emailDefault;
}else{ }else{