|
@@ -20,9 +20,7 @@ class Person_roomService extends CrudService {
|
|
|
condition.$or = [{ p1_id: p_id }, { p2_id: p_id }];
|
|
|
}
|
|
|
let data = await this.model.find(condition).skip(parseInt(skip)).limit(parseInt(limit));
|
|
|
- if (data.length > 0) data = JSON.parse(JSON.stringify(data));
|
|
|
// const notRead = await this.pc.find({ room_id: data.map(i => i._id), is_read: false, receiver_id: p_id });
|
|
|
- console.log();
|
|
|
const aggQuery = [
|
|
|
{ $match: { room_id: data.map(i => i._id), is_read: false, receiver_id: ObjectId(p_id) } },
|
|
|
{
|
|
@@ -32,9 +30,9 @@ class Person_roomService extends CrudService {
|
|
|
},
|
|
|
},
|
|
|
];
|
|
|
- console.log(aggQuery);
|
|
|
const r = await this.pc.aggregate(aggQuery);
|
|
|
console.log(r);
|
|
|
+ if (data.length > 0) data = JSON.parse(JSON.stringify(data));
|
|
|
const total = await this.model.count(condition);
|
|
|
return { data, total };
|
|
|
}
|