|
@@ -121,7 +121,7 @@ class member_talkControl extends mbMemberControl
|
|
|
return self::outerr(errcode::ErrParamter);
|
|
|
}
|
|
|
$result = $this->roomsg($msgid,$room_id);
|
|
|
- $msgs = $this->format_message($result['uids'],$result['msgs'],$type,0);
|
|
|
+ $msgs = $this->format_message($result['uids'],$result['msgs'],$type,0,$room_id);
|
|
|
}
|
|
|
elseif($type == 'chatwo')
|
|
|
{
|
|
@@ -139,11 +139,19 @@ class member_talkControl extends mbMemberControl
|
|
|
return self::outsuccess(["msgs" => $msgs]);
|
|
|
}
|
|
|
|
|
|
- private function format_message($uids,$msgs,$type,$other)
|
|
|
+ private function format_message($uids,$msgs,$type,$other=0,$room_id=0)
|
|
|
{
|
|
|
$members = [];
|
|
|
if(!empty($uids))
|
|
|
{
|
|
|
+ $room_members = Model('room')->getRoomParts(["room_id"=>$room_id],'member_id,member_nick',false);
|
|
|
+ $nicknames = [];
|
|
|
+ if(!empty($room)) {
|
|
|
+ foreach ($room_members as $room_member){
|
|
|
+ $nicknames[$room_member['member_id']] = $room_member['member_nick'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
$items = Model('member')->getMemberList(['member_id' => ['in',$uids]]);
|
|
|
foreach ($items as $item)
|
|
|
{
|
|
@@ -152,11 +160,14 @@ class member_talkControl extends mbMemberControl
|
|
|
$info = new member_info($item);
|
|
|
|
|
|
$val = [];
|
|
|
+ $mid = $info->member_id();
|
|
|
+ $nickname = empty($nicknames[$mid]) ? $info->nickname() : $nicknames[$mid];
|
|
|
+
|
|
|
$val['avatar'] = $info->avatar();
|
|
|
- $val['nickname'] = $info->nickname();
|
|
|
- $val['userid'] = $info->member_id();
|
|
|
+ $val['nickname'] = $nickname;
|
|
|
+ $val['userid'] = $mid;
|
|
|
|
|
|
- $members[$info->member_id()] = $val;
|
|
|
+ $members[$mid] = $val;
|
|
|
}
|
|
|
catch (Exception $ex) {
|
|
|
Log::record($ex->getMessage(),Log::ERR);
|