From 04bc5d7d172ea5d92d3472e5a1217d4794a8224a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 14 May 2022 22:11:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A8=E9=80=81=E6=94=B6=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84=E7=BE=A4=E7=BB=84=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/WebSocketDialog.php       | 17 +++++++++++++++++
 app/Tasks/WebSocketDialogMsgTask.php |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

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,