diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index 21e310360..4c158d67f 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -179,6 +179,23 @@ class WebSocketDialog extends AbstractModel } } + /** + * 获取群组名称 + * @return mixed|string|null + */ + public function getGroupName() + { + $name = $this->name; + if ($this->type == "group") { + if ($this->group_type === 'project') { + $name = \DB::table('projects')->where('dialog_id', $this->id)->value('name'); + } elseif ($this->group_type === 'task') { + $name = \DB::table('project_tasks')->where('dialog_id', $this->id)->value('name'); + } + } + return $name; + } + /** * 推送消息 * @param $action diff --git a/app/Tasks/WebSocketDialogMsgTask.php b/app/Tasks/WebSocketDialogMsgTask.php index dc1853b61..0f2cb6e63 100644 --- a/app/Tasks/WebSocketDialogMsgTask.php +++ b/app/Tasks/WebSocketDialogMsgTask.php @@ -84,7 +84,7 @@ class WebSocketDialogMsgTask extends AbstractTask // umeng推送app $msgTitle = User::userid2nickname($msg->userid); if ($dialog->type == 'group') { - $msgTitle = "{$dialog->name} ($msgTitle)"; + $msgTitle = "{$dialog->getGroupName()} ($msgTitle)"; } $umengMsg = new PushUmengMsg(array_keys($array), [ 'title' => $msgTitle,