|
@@ -29,21 +29,22 @@ export class ChatService extends BaseService<modelType> {
|
|
|
$replaceRoot: {
|
|
|
newRoot: '$other',
|
|
|
},
|
|
|
- }
|
|
|
+ },
|
|
|
]);
|
|
|
const data = [];
|
|
|
for (const val of list) {
|
|
|
- if (val.receiver_id === get(user, '_id')) {
|
|
|
- const userData = await this.uModel.findById(val.sender_id).lean();
|
|
|
- data.push({
|
|
|
- _id: val.sender_id,
|
|
|
- nick_name: get(userData, 'nick_name'),
|
|
|
- icon: get(userData, 'icon'),
|
|
|
- send_time: val.send_time,
|
|
|
- content: val.content,
|
|
|
- type: val.type,
|
|
|
- });
|
|
|
- }
|
|
|
+ let id = '';
|
|
|
+ if (val.sender_id !== get(user, '_id')) id = val.sender_id;
|
|
|
+ else id = val.receiver_id;
|
|
|
+ const userData = await this.uModel.findById(id).lean();
|
|
|
+ data.push({
|
|
|
+ _id: get(userData, '_id'),
|
|
|
+ nick_name: get(userData, 'nick_name'),
|
|
|
+ icon: get(userData, 'icon'),
|
|
|
+ send_time: val.send_time,
|
|
|
+ content: val.content,
|
|
|
+ type: val.type,
|
|
|
+ });
|
|
|
}
|
|
|
return data;
|
|
|
}
|