|
@@ -34,6 +34,7 @@ class PatentinfoService extends CrudService {
|
|
|
|
|
|
async query(query, { skip = 0, limit = 0 }) {
|
|
|
const newquery = await this.resetCode(query);
|
|
|
+ console.log(newquery);
|
|
|
const res = await this.model
|
|
|
.find(newquery)
|
|
|
.skip(parseInt(skip))
|
|
@@ -64,15 +65,13 @@ class PatentinfoService extends CrudService {
|
|
|
const plist = await this.personalModel.find({ code });
|
|
|
ids = plist.map(i => i._id);
|
|
|
if (ids.length > 0) {
|
|
|
- if (!newquery.inventor)newquery.inventor = {};
|
|
|
newquery['inventor.user_id'] = { $in: ids };
|
|
|
delete newquery.code;
|
|
|
}
|
|
|
} else if (user_id) {
|
|
|
- if (!newquery.inventor)newquery.inventor = {};
|
|
|
- newquery['inventor.user_id'] = { $in: [ ObjectId(user_id) ] };
|
|
|
+ newquery['inventor.user_id'] = ObjectId(user_id);
|
|
|
+ delete newquery.user_id;
|
|
|
}
|
|
|
-
|
|
|
return newquery;
|
|
|
}
|
|
|
|
|
@@ -84,6 +83,7 @@ class PatentinfoService extends CrudService {
|
|
|
const query = { 'inventor.user_id': { $in: pids } };
|
|
|
if (status) query.status = status;
|
|
|
if (term) query.term = term;
|
|
|
+ console.log(query);
|
|
|
const data = await this.model
|
|
|
.find(query)
|
|
|
.skip(parseInt(skip))
|