diff --git a/extension/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/extension/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php index 0c9c44846d..3702112c5d 100644 --- a/extension/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php +++ b/extension/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php @@ -121,6 +121,11 @@ class xuanxuanMessage extends messageModel $subcontent->parentURL = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink('feedback', 'browse', "id=$object->product", 'html')); $subcontent->cardURL = $url; } + elseif($objectType == 'demandpool') + { + if(!empty($object->owner)) $target .= trim($object->owner, ','); + if(!empty($object->reviewer)) $target .= ',' . trim($object->reviewer, ','); + } else { $subcontent->parentType = $objectType; diff --git a/module/message/model.php b/module/message/model.php index 9bd6aa9a23..3da699d9d0 100755 --- a/module/message/model.php +++ b/module/message/model.php @@ -188,11 +188,12 @@ class messageModel extends model public function getToList(object $object, string $objectType, int $actionID = 0): string { $toList = ''; - if(!empty($object->assignedTo)) $toList = $object->assignedTo; - if(empty($toList) && $objectType == 'todo') $toList = $object->account; - if(empty($toList) && $objectType == 'testtask') $toList = $object->owner; - if(empty($toList) && $objectType == 'meeting') $toList = $object->host . $object->participant; - if(empty($toList) && $objectType == 'mr') $toList = $object->createdBy . ',' . $object->assignee; + if(!empty($object->assignedTo)) $toList = $object->assignedTo; + if(empty($toList) && $objectType == 'todo') $toList = $object->account; + if(empty($toList) && $objectType == 'testtask') $toList = $object->owner; + if(empty($toList) && $objectType == 'meeting') $toList = $object->host . $object->participant; + if(empty($toList) && $objectType == 'mr') $toList = $object->createdBy . ',' . $object->assignee; + if(empty($toList) and $objectType == 'demandpool') $toList = trim($object->owner, ',') . ',' . trim($object->reviewer, ','); if(empty($toList) && $objectType == 'release') { /* Get notifiy persons. */