From fd3553901440ca395a528a08a12af47f2301c43b Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Mon, 30 Oct 2017 16:01:03 +0800
Subject: [PATCH] * @someone in message of dingding when assign an object.

---
 module/webhook/model.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/module/webhook/model.php b/module/webhook/model.php
index a2d13954a6..7b99c75124 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -334,25 +334,23 @@ class webhookModel extends model
      */
     public function getDingdingData($title, $text, $mobile)
     {
+        if($mobile) $text .= " @{$mobile}";
+
         $markdown = new stdclass();
         $markdown->title = $title;
         $markdown->text  = $text;
 
         $data = new stdclass();
+        $data->msgtype  = 'markdown';
+        $data->markdown = $markdown;
+
         if($mobile)
         {
             $at = new stdclass();
             $at->atMobiles = array($mobile);
             $at->isAtAll   = false;
 
-            $data->msgtype = 'text';
-            $data->text    = array('content' => $text);
-            $data->at      = $at;
-        }
-        else
-        {
-            $data->msgtype  = 'markdown';
-            $data->markdown = $markdown;
+            $data->at = $at;
         }
 
         return $data;