Merge branch 'sprint/178_hufangzhou_xuanxuan' into 'master'

* Fix an error for xuanxuan. See merge request easycorp/zentaopms!1154
2021-12-27 07:51:11 +00:00
parent 97ed7c1be6 e73cd865c1
commit 85ae7e23cb
1 changed files with 5 additions and 1 deletions
@@ -25,7 +25,7 @@ class xuanxuanMessage extends messageModel
                }
                else
                {
-                    $field = 'task.*';
+                    $field = 'obj.*';
                }
                $object = $this->dao->select($field)->from($this->config->objectTables[$objectType])->alias('obj')
                    ->beginIF($objectType == 'task')
@@ -89,6 +89,10 @@ class xuanxuanMessage extends messageModel
                    $subcontent->parentURL    = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink($parentType, 'browse', "id=$subcontent->parent", 'html'));
                    $subcontent->cardURL      = $url;
                }
+                else
+                {
+                    $subcontent->parentType = $objectType;
+                }

                $contentData = new stdclass();
                $contentData->title       = $title;