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 10:19:00 +08:00
parent 9d7fa6ad62 49436b65d5
commit e5babf08f2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ticket/controller/ConversationController.php
+1 -1
View File
@@ -28,7 +28,7 @@ class ConversationController extends BaseController
? $this->success() ? $this->success()
: $this->error(); : $this->error();
} catch (\Throwable $th) { } catch (\Throwable $th) {
return $this->error($th->getMessage().' '.$th->getLine().' '.$th->getFile()); return $this->error($th->getMessage());
} }
} }
public function edit(Request $request) public function edit(Request $request)
app/ticket/service/ConversationService.php
+1 -1
View File
@@ -25,7 +25,7 @@ class ConversationService
$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'] = empty($value['attachment'])?[]:unserialize($value['attachment']); $result[$key]['attachment'] = empty($value['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]['storage_path_full'][$k] = (!empty($attachment))?$ossservice->generatePrivateUrl($attachment['storage_path']):'';
} }
} }
return $result; return $result;