|
|
@@ -58,17 +58,17 @@ class PatentinfoService extends CrudService {
|
|
|
];
|
|
|
delete newquery.type;
|
|
|
}
|
|
|
- const { code, user_id } = newquery;
|
|
|
+ const { code, inventor } = newquery;
|
|
|
let ids = [];
|
|
|
if (code) {
|
|
|
const plist = await this.personalModel.find({ code });
|
|
|
ids = plist.map(i => i._id);
|
|
|
if (ids.length > 0) {
|
|
|
- newquery.user_id = { $elemMatch: { $in: ids } };
|
|
|
+ newquery.inventor = { $elemMatch: { $in: ids } };
|
|
|
delete newquery.code;
|
|
|
}
|
|
|
- } else if (user_id) {
|
|
|
- newquery.user_id = { $elemMatch: { $in: [ ObjectId(user_id) ] } };
|
|
|
+ } else if (inventor) {
|
|
|
+ newquery.inventor = { $elemMatch: { $in: [ ObjectId(inventor) ] } };
|
|
|
}
|
|
|
|
|
|
return newquery;
|
|
|
@@ -79,7 +79,7 @@ class PatentinfoService extends CrudService {
|
|
|
let pids = await this.personalModel.find({ code }, { _id: 1 });
|
|
|
if (pids.length <= 0) return { data: [], total: 0 };
|
|
|
pids = pids.map(i => i._id);
|
|
|
- const query = { user_id: { $elemMatch: { $in: pids } } };
|
|
|
+ const query = { inventor: { $elemMatch: { $in: pids } } };
|
|
|
if (status) query.status = status;
|
|
|
if (term) query.term = term;
|
|
|
const data = await this.model
|
