Merge branch 'feature/ticket0807' into develop_bm
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace app\ticket\service;
|
namespace app\ticket\service;
|
||||||
|
|
||||||
|
use app\common\model\User;
|
||||||
use app\common\service\OssService;
|
use app\common\service\OssService;
|
||||||
use app\ticket\logic\ConversationLogic;
|
use app\ticket\logic\ConversationLogic;
|
||||||
use config\constants\Constants;
|
use config\constants\Constants;
|
||||||
@@ -28,7 +29,7 @@ class ConversationService
|
|||||||
foreach ($value['attachment'] as $k => $attachment) {
|
foreach ($value['attachment'] as $k => $attachment) {
|
||||||
$value['attachment'][$k]['storage_path_full'] = (!empty($attachment))?$ossservice->generatePrivateUrl($attachment['storage_path']):'';
|
$value['attachment'][$k]['storage_path_full'] = (!empty($attachment))?$ossservice->generatePrivateUrl($attachment['storage_path']):'';
|
||||||
}
|
}
|
||||||
|
$value['user_name'] = User::where('id', $value['user_id'])->value('name');
|
||||||
$result[$key] = $value;
|
$result[$key] = $value;
|
||||||
}
|
}
|
||||||
return $result;
|
return $result;
|
||||||
|
|||||||
Reference in New Issue
Block a user