|
@@ -13,8 +13,8 @@ class Person_roomService extends CrudService {
|
|
}
|
|
}
|
|
async query(query) {
|
|
async query(query) {
|
|
query = this.ctx.service.util.util.turnDateRangeQuery(this.ctx.service.util.util.turnFilter(query));
|
|
query = this.ctx.service.util.util.turnDateRangeQuery(this.ctx.service.util.util.turnFilter(query));
|
|
- const { p_id, skip = 0, limit = 0 } = query;
|
|
|
|
- const condition = { ...query }; // last_time: { $exists: true },
|
|
|
|
|
|
+ const { p_id, skip = 0, limit = 0, ...info } = query;
|
|
|
|
+ const condition = { ...info }; // last_time: { $exists: true },
|
|
if (p_id) {
|
|
if (p_id) {
|
|
condition.$or = [{ p1_id: ObjectId(p_id) }, { p2_id: ObjectId(p_id) }];
|
|
condition.$or = [{ p1_id: ObjectId(p_id) }, { p2_id: ObjectId(p_id) }];
|
|
delete condition.p_id;
|
|
delete condition.p_id;
|