Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/Business/Message/MessageService.php

@@ -186,13 +186,15 @@ class MessageServiceModel extends \Business\AbstractModel
         $returnMemeber['toUserName']=$toMember['name'];
         $returnMemeber['toType']=(int)$toMember['type'];
         $returnMemeber['toAvatar']=$toMember['avatar'];
-        $returnMemeber['fromId']=(int)$self['uid'];
+        $returnMemeber['fromId']=$memberId;
+        $returnMemeber['fromUserId']=(int)$self['uid'];
         $returnMemeber['fromUserName']=$self['name'];
         $returnMemeber['fromType']=(int)$self['type'];
         $returnMemeber['fromAvatar']=$self['avatar'];
         $memberMessages=$messageHistory->getListByMemberIdAndToIdAndToType($memberId,$selfType,$toId,$toType,$field,$pageIndex,$pageSize);
         foreach($memberMessages['list'] as &$val){
             $val['message']=unserialize($val['message']);
+            $val['message']['title']=!empty($val['message']['title'])?$val['message']['title']:'';
         }
         $memberMessages['list']=array_reverse($memberMessages['list']);
         $returnMemeber['messages']=$memberMessages;