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

Merge branch 'feature/ticket0807' into develop_bm

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-08-11 09:51:43 +08:00
parent 7c159f7cb4 81ad0d0a97
commit b849e7c581
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ticket/service/ConversationService.php
+3 -3
View File
@@ -23,7 +23,7 @@ class ConversationService
$ossservice = new OssService(); $ossservice = new OssService();
foreach ($result as $key => $value) { foreach ($result as $key => $value) {
$result[$key]['content'] = str_replace($status_fanyi,$ticket_status,$value['content']); $result[$key]['content'] = str_replace($status_fanyi,$ticket_status,$value['content']);
$result[$key]['attachment'] = explode(",", $value['attachment']); $result[$key]['attachment'] = unserialize($value['attachment']);
foreach ($result[$key]['attachment'] as $k => $attachment) { foreach ($result[$key]['attachment'] as $k => $attachment) {
$result[$key]['attachment_full'][$k] = (!empty($attachment))?$ossservice->generatePrivateUrl($attachment):''; $result[$key]['attachment_full'][$k] = (!empty($attachment))?$ossservice->generatePrivateUrl($attachment):'';
} }
@@ -34,7 +34,7 @@ class ConversationService
public function add(array $data) public function add(array $data)
{ {
try { try {
$data['attachment'] = implode(",", $data['attachment']); $data['attachment'] = serialize($data['attachment']);
return (new ConversationLogic())->add($data); return (new ConversationLogic())->add($data);
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw $e; throw $e;
@@ -45,7 +45,7 @@ class ConversationService
{ {
try { try {
Db::beginTransaction(); Db::beginTransaction();
$data['attachment'] = implode(",", $data['attachment']); $data['attachment'] = serialize($data['attachment']);
$result = (new ConversationLogic())->edit($data); $result = (new ConversationLogic())->edit($data);
Db::commit(); Db::commit();
return $result; return $result;
app/ticket/service/TicketService.php
+1 -1
View File
@@ -53,7 +53,7 @@ class TicketService
'ticket_id' => $result->id, 'ticket_id' => $result->id,
'content' => $cleanContent, 'content' => $cleanContent,
'user_id' => $data['user_id'], 'user_id' => $data['user_id'],
'attachment' => implode(",", $data['attachment']), 'attachment' => serialize($data['attachment']),
]; ];
(new ConversationService())->add($conversation); (new ConversationService())->add($conversation);