Merge branch 'feature/ticket0807' into develop_bm
This commit is contained in:
@@ -23,7 +23,7 @@ class ConversationService
|
||||
$ossservice = new OssService();
|
||||
foreach ($result as $key => $value) {
|
||||
$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) {
|
||||
$result[$key]['attachment_full'][$k] = (!empty($attachment))?$ossservice->generatePrivateUrl($attachment):'';
|
||||
}
|
||||
@@ -34,7 +34,7 @@ class ConversationService
|
||||
public function add(array $data)
|
||||
{
|
||||
try {
|
||||
$data['attachment'] = implode(",", $data['attachment']);
|
||||
$data['attachment'] = serialize($data['attachment']);
|
||||
return (new ConversationLogic())->add($data);
|
||||
} catch (\Throwable $e) {
|
||||
throw $e;
|
||||
@@ -45,7 +45,7 @@ class ConversationService
|
||||
{
|
||||
try {
|
||||
Db::beginTransaction();
|
||||
$data['attachment'] = implode(",", $data['attachment']);
|
||||
$data['attachment'] = serialize($data['attachment']);
|
||||
$result = (new ConversationLogic())->edit($data);
|
||||
Db::commit();
|
||||
return $result;
|
||||
|
||||
@@ -53,7 +53,7 @@ class TicketService
|
||||
'ticket_id' => $result->id,
|
||||
'content' => $cleanContent,
|
||||
'user_id' => $data['user_id'],
|
||||
'attachment' => implode(",", $data['attachment']),
|
||||
'attachment' => serialize($data['attachment']),
|
||||
];
|
||||
(new ConversationService())->add($conversation);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user